RPM Packaging: update R14 packages

10 files changed, 65 insertions, 28 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 9421c0db9..e63f21016 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -56,7 +56,7 @@ python-tqt: sip4-tqt tdelibs
 
 sip4-tqt:
 	$(call buildpkg,dependencies/sip4-tqt)
-	
+
 tqca:	tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index b90f1eb85..43af9cd92 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -1,27 +1,27 @@
 # Default version for this component
 %define tde_pkg krecipes
-%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
-%endif
 
-# TDE specific building variables
+# TDE variables
+%define tde_version 14.0.0
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-
 %define _docdir %{tde_docdir}
 
+# 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
+
+
 
 Name:			trinity-%{tde_pkg}
 Summary:		Recipes manager for TDE
@@ -40,10 +40,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
@@ -64,7 +61,7 @@ with available ingredients and a diet helper. It can also import or export
 recipes from files in various format (eg RecipeML or Meal-Master) or from
 databases.
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -81,7 +78,6 @@ databases.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -104,7 +100,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --with-mysql \
   --with-postgresql
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 2eca7cef5..f30a4246b 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -41,7 +41,7 @@ fi
 if [ -r "${TEMPDIR}/one.patch" ]; then
   sed -i "${TEMPDIR}/"*.spec \
       -e "/^Source0:/ s/$/\nPatch0: one.patch/" \
-      -e "/%setup/ s/$/\n%patch0 -p1 -b .orig/"
+      -e "/%setup/ s/$/\n%patch0 -p1/"
 fi
 
 # Determines if we are running an i386 or x86_64 distro
@@ -66,7 +66,7 @@ rpmbuild -ba \
   --define "packager Francois\ Andriot\ <[email protected]>" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
-  --define "preversion ${PREVERSION:\\\"\\\"}" \
+  --define "preversion ${PREVERSION:-\\\"\\\"}" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 798bbdf78..ecce24978 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -63,6 +63,8 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl_2-2
 Summary:        Library of functions for 2D graphics - runtime files
 Group:			System/Libraries
+Obsoletes:		libart_lgpl < %{version}-%{release}
+Provides:		libart_lgpl = %{version}-%{release}
 Provides:		libart_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl_2-2
@@ -88,6 +90,7 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl-devel
 Summary:        Library of functions for 2D graphics - development files
 Group:          Development/Libraries
+Provides:		libart_lgpl-devel = %{version}-%{release}
 Requires:       %{libart}_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl-devel
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 5b6485d34..8e1ea70cb 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -38,7 +38,7 @@ BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 
 # TDE specific building variables
 BuildRequires:	python
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 %description
 SIP is a tool for generating bindings for C++ classes with some ideas
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index a85bae95c..8c24acab0 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -30,8 +30,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 BuildRequires:	trinity-tqca-devel >= 1.0
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 19010e5db..093461890 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -33,8 +33,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 
 
 %description
@@ -81,7 +80,7 @@ This packages contains the development files for TQCA
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 21f080922..fa1a1790a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -327,7 +327,7 @@ Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 Requires: glibc-devel
 Requires: fontconfig-devel
-Requires: freetype2-devel
+Requires: freetype-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
 Requires: zlib-devel
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 082f68c61..4c2ec49b4 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -80,6 +80,7 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/applications/tde
 %dir %{tde_datadir}/applnk
 %dir %{tde_datadir}/apps
+%dir %{tde_datadir}/cmake
 %dir %{tde_datadir}/config.kcfg
 %dir %{tde_datadir}/autostart
 %dir %{tde_datadir}/emoticons
@@ -88,10 +89,22 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/icons/hicolor
 %dir %{tde_datadir}/locale
 %dir %{tde_datadir}/mimelnk
+%dir %{tde_datadir}/mimelnk/all
+%dir %{tde_datadir}/mimelnk/application
+%dir %{tde_datadir}/mimelnk/audio
+%dir %{tde_datadir}/mimelnk/image
+%dir %{tde_datadir}/mimelnk/inode
+%dir %{tde_datadir}/mimelnk/message
+%dir %{tde_datadir}/mimelnk/model
+%dir %{tde_datadir}/mimelnk/multipart
+%dir %{tde_datadir}/mimelnk/text
+%dir %{tde_datadir}/mimelnk/uri
+%dir %{tde_datadir}/mimelnk/video
 %dir %{tde_datadir}/services
 %dir %{tde_datadir}/servicetypes
 
 %dir %{_sysconfdir}/trinity
+%dir %{_sysconfdir}/xdg/menus
 
 ##########
 
@@ -110,6 +123,7 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
@@ -118,6 +132,17 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/hicolor
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
 
@@ -139,6 +164,7 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
+%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
 %changelog
 * Mon Jun 03 2013 Francois Andriot <[email protected]> - 14.0.0-1
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 784a9a756..65b23fe48 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -51,7 +51,7 @@ License:	GPL-2.0+
 License:	GPLv2+
 %endif
 
-#Vendor:			Trinity Project
+#Vendor:			Trinity Desktop
 #Packager:		Francois Andriot <[email protected]>
 
 Prefix:			%{tde_prefix}
@@ -83,12 +83,22 @@ BuildRequires:	pkgconfig
 
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	openssl-devel
+
+# ALSA support
 BuildRequires:	alsa-lib-devel
+
+# IDN support
 BuildRequires:	libidn-devel
+
+# CUPS support
+BuildRequires:	cups-devel
+
+# TIFF support
 BuildRequires:	libtiff-devel
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 # GLIB2 support
 BuildRequires:	glib2-devel
 
@@ -445,6 +455,10 @@ Summary:	%{name} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	libtqt4-devel = 2:4.2.0
+Requires:	trinity-arts-devel >= 2:1.5.10
+
 Obsoletes:	tdelibs-devel < %{version}-%{release}
 Provides:	tdelibs-devel = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}