4b4a591a | 2014-10-30 05:01:50 | François Andriot |
RPM Packaging: update tdegames |
||
M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec M redhat/dependencies/libcaldav/libcaldav-14.0.0.spec M redhat/dependencies/libcarddav/libcarddav-14.0.0.spec M redhat/dependencies/python-tqt/python-tqt-14.0.0.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec M redhat/tdebase/tdebase-14.0.0.spec M redhat/tdegames/tdegames-14.0.0.spec R redhat/tdegames/kdegames-3.5.12.spec R redhat/tdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch R redhat/tdegames/kdegames-3.5.13-missing_ldflags.patch R redhat/tdegames/kdegames-3.5.13-sru-20120827.patch.gz R redhat/tdegames/kdegames-3.5.13.1.spec R redhat/tdegames/kdegames-3.5.13.spec |
||
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 6bc4313..f83aba4 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 @@ 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 @@ ########### %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 @@ ########## %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 fab0b73..9cb2a8c 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -66,15 +66,16 @@ # 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 @@ 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 031b326..5b93bdf 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -57,15 +57,16 @@ # 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 @@ 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 5d7b30a..000b009 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 @@ ########## %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 @@ 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 c79d9f6..893e109 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -287,6 +287,9 @@ %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 @@ 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} diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index a7e0f53..e77a423 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -307,7 +307,6 @@ %files -n trinity-ksayit %defattr(-,root,root,-) %{tde_bindir}/ksayit -%{tde_tdeincludedir}/ksayit_fxplugin.h %{tde_tdelibdir}/libFreeverb_plugin.la %{tde_tdelibdir}/libFreeverb_plugin.so %{tde_libdir}/libKTTSD_Lib.so.* @@ -467,6 +466,8 @@ Group: Development/Libraries/X11 Requires: %{name} = %{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} +Requires: libjpeg-devel +Requires: libpng-devel Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release} Provides: trinity-kdeaccessibility-devel = %{version}-%{release} @@ -481,6 +482,7 @@ %{tde_libdir}/libkttsd.so %{tde_libdir}/libKTTSD_Lib.la %{tde_libdir}/libKTTSD_Lib.so +%{tde_tdeincludedir}/ksayit_fxplugin.h %post devel /sbin/ldconfig ||: diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index b8dffef..abaf6a2 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -108,8 +108,8 @@ Obsoletes: tdebase < %{version}-%{release} Provides: tdebase = %{version}-%{release} -%if 0%{?suse_version} # for set_permissions macro +%if 0%{?suse_version} PreReq: permissions %endif @@ -235,7 +235,7 @@ # OpenSuse 11.4 Theme %if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 11.4 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -243,7 +243,7 @@ %if "%{?suse_version}" == "1220" Requires: wallpaper-branding = 12.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 12.2 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -251,7 +251,7 @@ %if "%{?suse_version}" == "1230" Requires: wallpaper-branding = 12.3 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 12.3 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -259,7 +259,7 @@ %if "%{?suse_version}" == "1310" Requires: wallpaper-branding = 13.1 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 13.1 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -269,6 +269,7 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: make +BuildRequires: fdupes # HTDIG support BuildRequires: htdig @@ -840,11 +841,11 @@ %package -n trinity-kate-devel Summary: Development files for kate -Group: System/GUI/Other +Group: Development/Libraries/Other Requires: trinity-kate = %{version}-%{release} %description -n trinity-kate-devel -%{summary}. +This package contains the development files fare Kate. %files -n trinity-kate-devel %defattr(-,root,root,-) @@ -3762,6 +3763,9 @@ chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh" chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" + ** Diff limit reached (max: 250 lines) ** |