RPM Packaging: update tdegames

5 files changed, 23 insertions, 10 deletions

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 6bc4313ac..f83aba4d6 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
@@ -30,7 +30,7 @@ Name:		trinity-dbus-1-tqt
 Epoch:		%{tde_epoch}
 Version:	0.9
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:	dbus bindings for the Trinity Qt [TQt] interface
+Summary:	Dbus bindings for the Trinity Qt [TQt] interface
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
@@ -74,7 +74,7 @@ See the dbus description for more information about D-BUS in general.
 ###########
 
 %package -n %{libdbus}-1-tqt0
-Summary:		dbus bindings for the Trinity Qt [TQt] interface
+Summary:		Dbus bindings for the Trinity Qt [TQt] interface
 Group:			System/Libraries
 Provides:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -104,7 +104,7 @@ See the dbus description for more information about D-BUS in general.
 ##########
 
 %package -n %{libdbus}-1-tqt-devel
-Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
+Summary:		Dbus bindings for the Trinity Qt [TQt] interface (Development Files)
 Group:			Development/Libraries/C and C++
 Provides:		libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index fab0b738d..9cb2a8c0a 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -66,15 +66,16 @@ BuildRequires:	gtk2-devel
 
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libcurl-devel
+%define libcurl_devel libcurl-devel
 %else
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}curl-devel
+%define libcurl_devel %{_lib}curl-devel
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#BuildRequires:	trinity-libcurl-devel
+#define libcurl_devel trinity-libcurl-devel
 %endif
 %endif
+%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
 %description
 libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
@@ -114,6 +115,8 @@ easy to integrate CalDAV support into any PIM application.
 Summary:	A client library that adds support for the CalDAV protocol (Development Files)
 Group:		Development/Libraries/C and C++
 Requires:	%{libcaldav}0 = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?libcurl_devel:Requires: %{libcurl_devel}}
+Requires:	glib2-devel
 
 Obsoletes:	trinity-libcaldav-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 031b326c5..5b93bdfbe 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -57,15 +57,16 @@ BuildRequires:	libtool
 
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libcurl-devel
+%define libcurl_devel libcurl-devel
 %else
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}curl-devel
+%define libcurl_devel %{_lib}curl-devel
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
-BuildRequires:	trinity-libcurl-devel
+#define libcurl_devel trinity-libcurl-devel
 %endif
 %endif
+%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
 # GTK2 support
 %if 0%{?rhel} == 4
@@ -113,6 +114,8 @@ Build dependencies are minimal, requiring only libcurl.
 Summary:	A portable CardDAV client implementation (Development Files)
 Group:		Development/Libraries/C and C++
 Requires:	libcarddav = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?libcurl_devel:Requires: %{libcurl_devel}}
+Requires:	glib2-devel
 
 Obsoletes:	trinity-libcarddav-devel < %{version}-%{release}
 Provides:	trinity-libcarddav-devel = %{version}-%{release}
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 5d7b30a36..000b00936 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -180,7 +180,7 @@ python-tqt Extensions. Contains:
 ##########
 
 %package -n trinity-pytqt-tools
-Summary:	pyuic and pylupdate for TQt
+Summary:	Pyuic and pylupdate for TQt
 Group:		Development/Libraries/Python
 Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -192,6 +192,7 @@ pylupdate is the counterpart for TQt's lupdate. It updates TQt
 Linguist translation files from Python code.
 
 %files -n trinity-pytqt-tools
+%defattr(-,root,root,-)
 %{tde_bindir}/pylupdate
 %{tde_bindir}/pyuic
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index c79d9f6e2..893e10952 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -287,6 +287,9 @@ BuildRequires: util-linux
 %endif
 
 %description
+This is the Trolltech TQt library, version 3. It's necessary for
+applications that link against the libtqt-mt.so.3, e.g. all Trinity
+applications.
 
 ##########
 
@@ -1492,6 +1495,9 @@ install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-example
 tar cvvfz tqt3-examples.tar.gz tqt3-examples/
 install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz"
 
+# Fix wrong permissions
+chmod 644 "%{?buildroot}%{_datadir}/tqt3/mkspecs/"*/*
+
 
 %clean
 %__rm -rf %{buildroot}