summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec2
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec8
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec (renamed from redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec)38
-rwxr-xr-xredhat/buildall.sh12
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec5
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-14.0.0.spec142
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec (renamed from redhat/dependencies/libcaldav/libcaldav.spec)0
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec134
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-3.5.12.spec (renamed from redhat/dependencies/libcarddav/libcarddav.spec)0
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec8
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec2
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
-rw-r--r--redhat/tde-i18n/tde-i18n-14.0.0.spec2
-rw-r--r--redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec4
-rw-r--r--redhat/tdeaddons/tdeaddons-14.0.0.spec7
-rw-r--r--redhat/tdeartwork/tdeartwork-14.0.0.spec4
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec21
-rw-r--r--redhat/tdebindings/tdebindings-14.0.0.spec16
-rw-r--r--redhat/tdegames/tdegames-14.0.0.spec4
-rw-r--r--redhat/tdegraphics/tdegraphics-14.0.0.spec16
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec2
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec4
-rw-r--r--redhat/tdenetwork/tdenetwork-14.0.0.spec14
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec12
-rw-r--r--redhat/tdeutils/tdeutils-14.0.0.spec4
-rw-r--r--redhat/tdevelop/tdevelop-14.0.0.spec4
-rw-r--r--redhat/tdewebdev/tdewebdev-14.0.0.spec5
27 files changed, 381 insertions, 91 deletions
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index dfb0ace2a..d12f8bcef 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -126,7 +126,7 @@ BuildRequires: libvisual-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel
%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: libtunepimp-devel
%endif
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index 3357790a1..c1fa65c21 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -27,7 +27,7 @@ Name: trinity-%{kdecomp}
Summary: a DBUS notification service [Trinity]
Version: 0.1
-Release: 4%{?dist}%{?_variant}
+Release: 4.1%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,6 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-3.5.13.2.tar.gz
+Patch1: kdbusnotification-14.0.0-fix_utf8.patch
+
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
BuildRequires: trinity-arts-devel >= 3.5.13.2
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
@@ -66,6 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep
%setup -q -n %{name}-3.5.13.2
+%patch1 -p1 -b .utf8
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -117,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
+* Sun Jul 21 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4.1
+- Fix UTF8 messages
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 73930db63..2cfd123e8 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -1,11 +1,6 @@
# Default version for this component
-%define tde_pkg knetworkmanager
+%define tde_pkg knetworkmanager8
%define tde_version 14.0.0
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
@@ -30,7 +25,7 @@
Name: trinity-%{tde_pkg}
-Version: %{?version}
+Version: 0.8
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity applet for Network Manager
@@ -39,17 +34,10 @@ Group: Applications/Internet
License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager
-%if "%{?version}" == "0.9"
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-%else
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-%endif
Patch0: knetworkmanager-3.5.13-missing_includes.patch
-# For knetworkmanager 0.9 only !
-Patch10: knetworkmanager-3.5.13-subdir_version.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: kde-filesystem
@@ -65,6 +53,9 @@ BuildRequires: trinity-dbus-1-tqt-devel
BuildRequires: trinity-dbus-tqt-devel
BuildRequires: NetworkManager-glib-devel
+Obsoletes: trinity-knetworkmanager < %{version}-%{release}
+Provides: trinity-knetworkmanager = %{version}-%{release}
+
%description
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
@@ -75,6 +66,9 @@ Summary: Common data shared among the MySQL GUI Suites
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release}
+Provides: trinity-knetworkmanager-devel = %{version}-%{release}
+
%description devel
Development headers for knetworkmanager
@@ -85,21 +79,12 @@ Development headers for knetworkmanager
%prep
-%if "%{?version}" == "0.9"
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%else
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
cd knetworkmanager-0.*/src
%patch0 -p3
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
@@ -125,7 +110,8 @@ cd build
-DCMAKE_SKIP_RPATH="OFF" \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
+
%install
%__rm -rf $RPM_BUILD_ROOT
@@ -142,18 +128,22 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%postun
update-desktop-database %{tde_appdir} > /dev/null
/sbin/ldconfig
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%post devel
/sbin/ldconfig
+
%postun devel
/sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%{tde_bindir}/knetworkmanager
diff --git a/redhat/buildall.sh b/redhat/buildall.sh
index d1c596695..000e0a9fd 100755
--- a/redhat/buildall.sh
+++ b/redhat/buildall.sh
@@ -1,7 +1,8 @@
#!/bin/bash
tdp='cd ~/tde/tde-packaging/redhat'
-grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
+#grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
+grp='tdp; ./genrpm.sh -v 14.0.0 -a'
BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
@@ -75,10 +76,11 @@ grpiud() {
# Build dependencies
rm -rf "${BUILDDIR}" "${BUILDROOTDIR}"
-if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then
- grpiu dependencies/qt3
- eval ${PKGINST} qt3-devel
-fi
+#if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then
+# grpiu dependencies/qt3
+# eval ${PKGINST} qt3-devel
+#fi
+grpiud dependencies/tqt3
grpiud dependencies/tqtinterface
grpi dependencies/arts
grpi dependencies/avahi-tqt
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 7657a1bdc..ecee40f36 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -118,6 +118,5 @@ cd build
%changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
-
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
new file mode 100644
index 000000000..fbe3bf8d2
--- /dev/null
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -0,0 +1,142 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_version 14.0.0
+
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name: trinity-libcaldav
+Version: 0.6.5
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+
+Vendor: Trinity Project
+URL: http://www.trinitydesktop.org/
+Packager: Francois Andriot <francois.andriot@free.fr>
+
+License: GPL
+Group: System Environment/Libraries
+Summary: A client library that adds support for the CalDAV protocol (rfc4791).
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: libtool
+%if 0%{?rhel} == 4
+BuildRequires: evolution28-gtk2-devel
+%else
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+%endif
+BuildRequires: make
+
+Obsoletes: libcaldav < %{version}-%{release}
+Provides: libcaldav = %{version}-%{release}
+
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+BuildRequires: libcurl-devel
+%else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
+BuildRequires: trinity-libcurl-devel
+%endif
+%endif
+
+%description
+libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
+The object is to have a library which fully implements the protocol so that it is
+easy to integrate CalDAV support into any PIM application.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+Obsoletes: libcaldav-devel < %{version}-%{release}
+Provides: libcaldav-devel = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.sh
+
+
+%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d /usr/evolution28 ]; then
+ export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
+%configure \
+ --docdir=%{tde_docdir}/libcaldav \
+ --includedir=%{tde_includedir} \
+ --libdir=%{tde_libdir} \
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__rm -f %{buildroot}%{tde_libdir}/*.a
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libcaldav.so.*
+%{tde_docdir}/libcaldav/
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/libcaldav/caldav.h
+%{tde_libdir}/libcaldav.la
+%{tde_libdir}/libcaldav.so
+%{tde_libdir}/pkgconfig/libcaldav.pc
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%Changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4
+- Initial release for TDE R14.0.0
+
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
+- Add missing BuildRequires
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
index f792bb98d..f792bb98d 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
new file mode 100644
index 000000000..42ba6579e
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -0,0 +1,134 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_version 14.0.0
+
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name: trinity-libcarddav
+Version: 0.6.2
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+
+Vendor: Trinity Project
+URL: http://www.trinitydesktop.org/
+Packager: Francois Andriot <francois.andriot@free.fr>
+
+License: GPL
+Group: System Environment/Libraries
+Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite.
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+BuildRequires: libcurl-devel
+%else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
+BuildRequires: trinity-libcurl-devel
+%endif
+%endif
+
+%if 0%{?rhel} == 4
+BuildRequires: evolution28-gtk2-devel
+%else
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+%endif
+BuildRequires: make
+
+Obsoletes: libcarddav < %{version}-%{release}
+Provides: libcarddav = %{version}-%{release}
+
+%description
+Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite.
+It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards.
+Build dependencies are minimal, requiring only libcurl.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+Obsoletes: libcarddav-devel < %{version}-%{release}
+Provides: libcarddav-devel = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.sh
+
+
+%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d /usr/evolution28 ]; then
+ export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
+#autoreconf --force --install --symlink
+
+%configure \
+ --includedir=%{tde_includedir} \
+ --libdir=%{tde_libdir} \
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+
+%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libcarddav.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/libcarddav/
+%{tde_libdir}/libcarddav.la
+%{tde_libdir}/libcarddav.so
+%{tde_libdir}/pkgconfig/libcarddav.pc
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
index 3bb4deca1..3bb4deca1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 1e33edf24..e86012b01 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -29,10 +29,16 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: python-tqt-14.0.0-ftbfs.patch
BuildRequires: gcc-c++
-BuildRequires: python-sip
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tqscintilla-devel
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: sip-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: python-sip
+%endif
+
# TDE specific building variables
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 7d46981ae..083cfcf91 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -17,7 +17,7 @@
Name: trinity-tqca
Version: 1.0
-Release: 3%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
Summary: TQt Cryptographic Architecture
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 2b178e846..9c7169d79 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -262,7 +262,9 @@ This package contains a graphical configuration tool for programs using TQt 3.
%package devel
Summary: Development files for the TQt 3 GUI toolkit
Group: Development/Libraries
+
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-designer = %{version}-%{release}
%description devel
The %{name}-devel package contains the files necessary to develop
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index e99903cc6..f15a9c263 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -1248,7 +1248,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%endif
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 35ca62871..5365eee7c 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -506,5 +506,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index 365884027..62d11ae6b 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -710,7 +710,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--with-sdl \
%if 0%{?with_db4}
--with-berkeley-db \
-%if 0%{?fedora} == 18
+%if 0%{?fedora} >= 18
--with-db-lib=db_cxx-4 \
%endif
%endif
@@ -747,6 +747,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 6f5e3755a..2fe27c3b8 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -718,5 +718,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 9d0c4e21c..59dc174f8 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -473,7 +473,7 @@ Requires: trinity-kappfinder = %{version}-%{release}
Requires: trinity-kate = %{version}-%{release}
Requires: trinity-kwrite = %{version}-%{release}
Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
+Requires: trinity-tdepasswd = %{version}-%{release}
Requires: trinity-tdeprint = %{version}-%{release}
Requires: trinity-kdesktop = %{version}-%{release}
Requires: trinity-tdm = %{version}-%{release}
@@ -1744,21 +1744,24 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
##########
-%package -n trinity-kdepasswd
+%package -n trinity-tdepasswd
Summary: password changer for TDE
Group: Applications/Utilities
-%description -n trinity-kdepasswd
+Obsoletes: trinity-kdepasswd < %{version}-%{release}
+Provides: trinity-kdepasswd = %{version}-%{release}
+
+%description -n trinity-tdepasswd
This is a simple application which allows users to change their
system passwords.
-%files -n trinity-kdepasswd
+%files -n trinity-tdepasswd
%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
+%{tde_bindir}/tdepasswd
%{tde_tdelibdir}/kcm_useraccount.la
%{tde_tdelibdir}/kcm_useraccount.so
%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
+%{tde_tdeappdir}/tdepasswd.desktop
%exclude %{tde_datadir}/apps/tdm/pics/users/default1.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default2.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default3.png
@@ -1767,10 +1770,10 @@ system passwords.
%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-%post -n trinity-kdepasswd
+%post -n trinity-tdepasswd
update-desktop-database %{tde_appdir} 2> /dev/null || :
-%postun -n trinity-kdepasswd
+%postun -n trinity-tdepasswd
update-desktop-database %{tde_appdir} 2> /dev/null || :
##########
@@ -1959,7 +1962,7 @@ process which presents the user with a menu of possible hosts that offer
XDMCP display management.
A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
+TDE, but as part of the tdepasswd package.
The menu package will help to provide TDM with a list of window managers
that can be launched, if the window manager does not register with TDM
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index 947093224..dc72026fe 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -5,6 +5,8 @@
# or 64 bits:
# ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
+%define tde_version 14.0.0
+
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
@@ -107,7 +109,8 @@ BuildRequires: libgdk_pixbuf2.0-devel
%else
BuildRequires: %{_lib}gdk_pixbuf2.0-devel
%endif
-%else
+%endif
+%if 0%{?fedora}
%if 0%{?fedora} >= 17
BuildRequires: gdk-pixbuf2-devel
%else
@@ -930,7 +933,9 @@ Requires: trinity-libdcop-c = %{version}-%{release}
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: trinity-tdelibs-devel
+
+Requires: trinity-tdelibs-devel >= %{tde_version}
+Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-kdebindings-devel < %{version}-%{release}
Provides: trinity-kdebindings-devel = %{version}-%{release}
@@ -1019,7 +1024,8 @@ fi
--enable-closure \
--enable-final \
%{?_with_java} %{!?_with_java:--without-java} \
- %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
+ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
+ --with-extra-includes=%{_includedir}/tqscintilla
# Build dcopperl with specific options
pushd dcopperl
@@ -1100,5 +1106,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec
index 9d9ddd864..5b7e05d60 100644
--- a/redhat/tdegames/tdegames-14.0.0.spec
+++ b/redhat/tdegames/tdegames-14.0.0.spec
@@ -1589,5 +1589,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index fb8164468..89147aebb 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -640,7 +640,7 @@ MRML server.
%{tde_tdelibdir}/libkmrmlpart.so
%{tde_tdelibdir}/mrmlsearch.la
%{tde_tdelibdir}/mrmlsearch.so
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.so
+%{tde_libdir}/libtdeinit_mrmlsearch.so
%{tde_tdeappdir}/kcmkmrml.desktop
%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
%{tde_datadir}/mimelnk/text/mrml.desktop
@@ -965,7 +965,7 @@ as well.
%{tde_tdelibdir}/libkviewcanvas.so
%{tde_tdelibdir}/libkviewviewer.la
%{tde_tdelibdir}/libkviewviewer.so
-%{tde_libdir}/lib[kt]deinit_kview.so
+%{tde_libdir}/libtdeinit_kview.so
%{tde_libdir}/libkimageviewer.so.*
%{tde_tdelibdir}/libphotobook.la
%{tde_tdelibdir}/libphotobook.so
@@ -1181,8 +1181,8 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
-%{tde_libdir}/lib[kt]deinit_kview.la
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.la
+%{tde_libdir}/libtdeinit_kview.la
+%{tde_libdir}/libtdeinit_mrmlsearch.la
%{tde_libdir}/libkghostviewlib.la
%{tde_libdir}/libkghostviewlib.so
%{tde_libdir}/libkimageviewer.la
@@ -1213,8 +1213,8 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
#%exclude %{tde_bindir}/kuickshow
#%exclude %{tde_tdelibdir}/kuickshow.la
#%exclude %{tde_tdelibdir}/kuickshow.so
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
+#%exclude %{tde_libdir}/libtdeinit_kuickshow.la
+#%exclude %{tde_libdir}/libtdeinit_kuickshow.so
#%exclude %{tde_tdeappdir}/kuickshow.desktop
#%exclude %{tde_datadir}/apps/kuickshow/
#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
@@ -1318,5 +1318,5 @@ done
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 22303545a..09b45272b 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -1,3 +1,5 @@
+# Remove qt-devel and qt3-devel and any kde*-devel that may interfere !!!
+
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index c1378b00f..380eb2d14 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -52,17 +52,15 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-tqt3-devel >= %{version}
+BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
%if "%{?_with_akode}" != ""
BuildRequires: trinity-akode-devel
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: trinity-akode-libmad
%endif
-%endif
BuildRequires: desktop-file-utils
BuildRequires: zlib-devel
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index debd146aa..a64fcc8a5 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -76,7 +76,6 @@ BuildRequires: sqlite3-devel
BuildRequires: sqlite-devel
%endif
BuildRequires: gnutls-devel
-BuildRequires: libxtst-devel
# GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -91,6 +90,10 @@ BuildRequires: libXtst-devel
BuildRequires: libXxf86vm-devel
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+BuildRequires: libxtst-devel
+%endif
+
# Wifi support
%if "%{?_with_wifi:1}" == "1"
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
@@ -153,9 +156,9 @@ BuildRequires: meanwhile-devel
%endif
# ORTP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: ortp-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#BuildRequires: ortp-devel
+#%endif
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@@ -257,6 +260,7 @@ update-desktop-database 2> /dev/null || :
%package devel
Summary: Development files for the Trinity network module
Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
Requires: trinity-kdict = %{version}-%{release}
Requires: trinity-kopete = %{version}-%{release}
Requires: trinity-ksirc = %{version}-%{release}
@@ -1193,5 +1197,5 @@ EOF
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index 3da6004e4..09964dbaf 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -18,7 +18,7 @@
Name: trinity-tdesdk
-Summary: The KDE Software Development Kit (SDK)
+Summary: The Trinity Software Development Kit (SDK)
Version: 14.0.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
@@ -1148,15 +1148,11 @@ fi
# Removes useless stuff
%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
+
%clean
%__rm -rf %{buildroot}
-
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
-* Wed Nov 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- Fix various cmake issues [Bug #1262]
-
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index 12d9ede37..b60ca65d5 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -1088,5 +1088,5 @@ fi
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index 323901fd4..d5ee9853b 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -628,5 +628,5 @@ cd ..
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index 03f37c21d..5176af625 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -467,6 +467,7 @@ Obsoletes: trinity-kdewebdev-devel < %{version}-%{release}
Provides: trinity-kdewebdev-devel = %{version}-%{release}
Requires: trinity-tdelibs-devel
+Requires: %{name} = %{version}-%{release}
Requires: trinity-kommander-devel = %{version}-%{release}
%description devel
@@ -566,5 +567,5 @@ popd
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0