diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-17 23:16:27 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-17 23:16:27 +0200 |
| commit | 3981ced036cda6b6a52203f600990c360571d1f5 (patch) | |
| tree | 573b36b17eb54ce4e9178a41b3df12dce56bed34 | |
| parent | 9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6 (diff) | |
| download | tde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.tar.gz tde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.zip | |
RPM Packaging: update packages for 3.5.13.2 under Fedora 19
126 files changed, 4544 insertions, 3969 deletions
diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec index 92c5c4c0a..318512989 100644 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ b/redhat/applications/abakus/abakus-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp abakus +%define tde_pkg abakus +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -21,27 +22,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Calculator for TDE -Version: 0.91 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Calculator for TDE +Version: 0.91 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 +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: cmake >= 2.8 BuildRequires: bison @@ -59,14 +62,13 @@ has the user-friendly menu options of a normal TDE application. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" # Do not build against any "/usr" installed KDE export KDEDIR="%{tde_prefix}" @@ -82,6 +84,13 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ -DBUILD_ALL=ON \ @@ -119,7 +128,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/applnk/Utilities/abakus.desktop %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-6 +- Build for Fedora 19 + +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-5 - Initial release for TDE 3.5.13.2 * Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-4 diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec index 14e09acf1..ef01e0480 100644 --- a/redhat/applications/adept/adept-3.5.13.2.spec +++ b/redhat/applications/adept/adept-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp adept +%define tde_pkg adept +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,26 +24,26 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Package management suite for Trinity -Version: 2.1.3 -Release: 1%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Package management suite for Trinity +Version: 2.1.3 +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://lpnotfr.free.fr/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils Requires: %{name}-manager = %{version}-%{release} @@ -67,8 +68,8 @@ These packages belong to the adept suite: ########## %package common -Requires: trinity-konsole -Summary: Package manager for Trinity -- common files +Requires: trinity-konsole +Summary: Package manager for Trinity -- common files %description common Icons and other common files for all adept components. @@ -76,8 +77,8 @@ Icons and other common files for all adept components. ########## %package manager -Requires: %{name}-common = %{version}-%{release} -Summary: package manager for Trinity +Requires: %{name}-common = %{version}-%{release} +Summary: package manager for Trinity %description manager Adept Manager is a graphical user interface for package management. @@ -88,26 +89,26 @@ Besides these basic functions the following features are provided: * Edit the list of used repositories (sources.list) * Configure packages through the debconf system -Please also install libtqt-perl if you want the KDE Debconf frontend +Please also install libtqt-perl if you want the TDE Debconf frontend to function. ########## %package installer -Requires: %{name}-common = %{version}-%{release} -Summary: simple user interface for application management (for Trinity) +Requires: %{name}-common = %{version}-%{release} +Summary: simple user interface for application management (for Trinity) %description installer Adept Installer presents a list of applications available through the Advanced Package Tool (APT). An application is considered a package -that contains a .desktop file for use with KDE, GNOME or other +that contains a .desktop file for use with TDE, GNOME or other desktop environment. ########## %package updater -Requires: %{name}-common = %{version}-%{release} -Summary: system update tool for Trinity +Requires: %{name}-common = %{version}-%{release} +Summary: system update tool for Trinity %description updater Adept Updater provides a simple wizard-style user interface to system @@ -116,9 +117,9 @@ upgrades. It uses same algorithms as apt-get dist-upgrade. ########## %package notifier -Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-updater = %{version}-%{release} -Summary: System tray notifier of available system updates +Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-updater = %{version}-%{release} +Summary: System tray notifier of available system updates %description notifier Adept Notifier provides a system tray icon notifying the user of @@ -128,8 +129,8 @@ clicked. ########## %package batch -Requires: %{name}-manager = %{version}-%{release} -Summary: command line install for Adept +Requires: %{name}-manager = %{version}-%{release} +Summary: command line install for Adept %description batch Adept Batch lets you install packages with Adept from the @@ -145,13 +146,7 @@ by external applications. ########## %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -161,7 +156,6 @@ by external applications. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -172,7 +166,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ --enable-closure %__make %{?_smp_mflags} -C adept @@ -183,7 +176,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang adept +%find_lang %{tde_pkg} %clean diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec index e3a183dd5..102cfa9fd 100644 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ b/redhat/applications/amarok/amarok-3.5.13.2.spec @@ -26,22 +26,25 @@ Name: trinity-%{tde_pkg} Summary: Media player Version: 1.4.10 -Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant} Group: Applications/Multimedia License: GPLv2+ -Url: http://amarok.kde.org +Url: http://amarok.kde.org Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch +Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch 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: trinity-konqueror-devel >= %{tde_version} BuildRequires: alsa-lib-devel @@ -51,10 +54,12 @@ BuildRequires: gettext BuildRequires: pcre-devel BuildRequires: taglib-devel +# LIBTOOL BuildRequires: libtool %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif + BuildRequires: libusb-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -76,7 +81,7 @@ BuildRequires: dbus-devel %if 0%{?rhel} == 4 BuildRequires: dbus-qt %else -BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} +BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %endif # IFP support @@ -184,7 +189,7 @@ Amarok is a multimedia player with: - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the TDE look, but with a unique touch -%files -f amarok.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog README %{tde_bindir}/amarok @@ -353,8 +358,6 @@ use any of xmms' visualisation plugins with Amarok. unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}" # Do not build against any "/usr" installed KDE export KDEDIR=%{tde_prefix} @@ -370,33 +373,33 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \ - \ - %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ - -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ - %{?with_yauap:-DWITH_YAUAP=ON} \ - %{?with_akode:-DWITH_AKODE=ON} \ - %{?with_gpod:-DWITH_IPOD=ON} \ - %{?with_ifp:-DWITH_IFP=ON} \ - %{?with_njb:-DWITH_NJB=ON} \ - %{?with_mtp:-DWITH_MTP=ON} \ - %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ - %{?with_mp4v2:-DWITH_MP4V2=ON} \ - %{?with_inotify:-DWITH_INOTIFY=ON} \ - -DBUILD_ALL=ON \ - .. + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ + -DWITH_KONQSIDEBAR=ON \ + %{?with_xine:-DWITH_XINE=ON} \ + %{?with_yauap:-DWITH_YAUAP=ON} \ + %{?with_akode:-DWITH_AKODE=ON} \ + %{?with_gpod:-DWITH_IPOD=ON} \ + %{?with_ifp:-DWITH_IFP=ON} \ + %{?with_njb:-DWITH_NJB=ON} \ + %{?with_mtp:-DWITH_MTP=ON} \ + %{?with_karma:-DWITH_RIOKARMA=ON} \ + -DWITH_DAAP=ON \ + %{?with_mp4v2:-DWITH_MP4V2=ON} \ + %{?with_inotify:-DWITH_INOTIFY=ON} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -430,6 +433,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10 - Rebuild with NDEBUG option diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec index a175d11b5..a44ddd45f 100644 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ b/redhat/applications/basket/basket-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: Taking care of your ideas. Version: 1.0.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -41,6 +41,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: trinity-tdepim-devel >= %{tde_version} @@ -66,12 +67,6 @@ baskets to HTML. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -82,17 +77,21 @@ unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --disable-rpath \ - --disable-debug \ - --with-extra-includes=%{tde_includedir}/tqt \ - --disable-static + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -114,6 +113,7 @@ for f in crystalsvg ; do gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done /sbin/ldconfig +update-desktop-database %{tde_tdeappdir} -q &> /dev/null %postun for f in crystalsvg ; do @@ -121,6 +121,7 @@ for f in crystalsvg ; do gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done /sbin/ldconfig +update-desktop-database %{tde_tdeappdir} -q &> /dev/null %files -f %{tde_pkg}.lang @@ -159,6 +160,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5 - Rebuild with NDEBUG option diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec index 2a590f7af..16ee7e1c7 100644 --- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec +++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp bibletime +%define tde_pkg bibletime +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,28 +23,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: A bible study tool for Trinity -Version: 1.6.6.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A bible study tool for Trinity +Version: 1.6.6.0 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 +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 # Requires: clucene @@ -72,13 +74,7 @@ texts, write own notes, save, print etc.). %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -88,17 +84,21 @@ texts, write own notes, save, print etc.). %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath # Not SMP safe ! %__make -C bibletime/frontend @@ -124,12 +124,12 @@ export PATH="%{tde_bindir}:${PATH}" %post touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : +update-desktop-database %{tde_datadir}/applications -q &> /dev/null %postun touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : +update-desktop-database %{tde_datadir}/applications -q &> /dev/null %files @@ -143,6 +143,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec index 8af183e1b..ff084696c 100644 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ b/redhat/applications/digikam/digikam-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: digital photo management application for TDE [Trinity] Version: 0.9.6 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -44,20 +44,24 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: digikam-3.5.13.2-fix_png12_support.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-libkexiv2-devel >= %{tde_version} -BuildRequires: trinity-libkdcraw-devel >= %{tde_version} -BuildRequires: trinity-libkipi-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-libkexiv2-devel +BuildRequires: trinity-libkdcraw-devel +BuildRequires: trinity-libkipi-devel + +BuildRequires: libtiff-devel +BuildRequires: gettext + +# GPHOTO2 support %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: gphoto2-devel %else BuildRequires: libgphoto2-devel %endif -BuildRequires: libtiff-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext # JASPER support %if 0%{?suse_version} @@ -77,9 +81,9 @@ BuildRequires: libexiv2-devel BuildRequires: exiv2-devel %endif -Requires: trinity-libkexiv2 >= %{tde_version} -Requires: trinity-libkdcraw >= %{tde_version} -Requires: trinity-libkipi >= %{tde_version} +Requires: trinity-libkexiv2 +Requires: trinity-libkdcraw +Requires: trinity-libkipi %description An easy to use and powerful digital photo management @@ -105,7 +109,7 @@ digiKam is based in part on the work of the Independent JPEG Group. %package devel Group: Development/Libraries Summary: Development files for %{name} -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel %{summary} @@ -122,12 +126,6 @@ Requires: %{name} = %{version} %patch1 -p1 -b .png12 %endif -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -136,7 +134,6 @@ Requires: %{name} = %{version} %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}" export KDEDIR="%{tde_prefix}" %configure \ @@ -153,9 +150,7 @@ export KDEDIR="%{tde_prefix}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_tdeincludedir}/tqt + --enable-rpath %__make %{?_smp_mflags} || %__make @@ -319,6 +314,9 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6 - Rebuild with NDEBUG option diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec index 711989c20..5ba78e34d 100644 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp dolphin +%define tde_pkg dolphin +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,27 +23,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: File manager for TDE focusing on usability -Version: 0.9.2 -Release: 7%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: File manager for TDE focusing on usability +Version: 0.9.2 +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -58,13 +61,7 @@ interface for the task of file management. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -74,7 +71,6 @@ interface for the task of file management. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -84,8 +80,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --docdir=%{tde_tdedocdir} \ --libdir=%{tde_libdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -95,33 +96,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop' -sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \ - -e "/^Name\[pa\].*/d" - -desktop-file-install --vendor "" \ - --delete-original \ - --dir %{buildroot}%{tde_datadir}/applications/ \ - %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi # Makes 'media_safelyremove.desktop' an alternative %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin @@ -131,11 +105,13 @@ fi %find_lang d3lphin + %clean %__rm -rf %{buildroot} %post +update-desktop-database %{tde_tdeappdir} -q &> /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : update-alternatives --install \ @@ -152,6 +128,7 @@ if [ $1 -eq 0 ]; then fi %postun +update-desktop-database %{tde_tdeappdir} -q &> /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : @@ -160,7 +137,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{tde_bindir}/d3lphin -%{tde_datadir}/applications/d3lphin.desktop +%{tde_tdeappdir}/d3lphin.desktop %{tde_datadir}/apps/d3lphin/ %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ @@ -168,6 +145,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-8 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-7 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec index 385d23417..154efd222 100644 --- a/redhat/applications/filelight/filelight-3.5.13.2.spec +++ b/redhat/applications/filelight/filelight-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: Graphical disk usage display Version: 1.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -41,6 +41,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 @@ -61,12 +62,6 @@ directories on your computer. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -91,9 +86,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath %__make %{?_smp_mflags} @@ -144,6 +137,9 @@ done %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-8 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7 - Rebuild with NDEBUG option diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec index df1677c87..287fcc093 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp gtk-qt-engine +%define tde_pkg gtk-qt-engine +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,30 +24,32 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: 0.8 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: theme engine using Qt for GTK+ 2.x and Trinity +Version: 0.8 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: gtk-qt-engine.rc.sh +Source2: gtkrc-2.0-kde4 +Source3: gtkrc-2.0-kde-kde4 -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -68,18 +71,6 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-3.5.13.2%{?preversion:~%{preversion}} -# Renames the '.po' files -for f in po/*/*.po; do - pushd ${f%/*} - mv -f *.po gtk-qt-engine.po - popd -done - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - %build unset QTDIR || : ; . /etc/profile.d/qt3.sh @@ -92,11 +83,18 @@ cd build %endif %cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + .. %__make %{?_smp_mflags} @@ -106,19 +104,19 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{kdecomp} +%find_lang gtkqtengine # Adds TDE's specific GTKRC %__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh %__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 %__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 + %clean %__rm -rf %{buildroot} - -%files -f %{kdecomp}.lang +%files -f gtkqtengine.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_tdelibdir}/kcm_kcmgtk.la @@ -134,6 +132,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec index 73a30a059..4fc6a56ce 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp gwenview-i18n +%define tde_pkg gwenview-i18n +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,31 +24,32 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: Gwenview is an image viewer for KDE. -Version: 1.4.2 -Release: 2%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Gwenview is an image viewer for TDE. +Version: 1.4.2 +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 # EXIV2 support @@ -86,13 +88,7 @@ KIPI image framework. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -114,9 +110,13 @@ export KDEDIR="%{tde_prefix}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -126,33 +126,13 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - - - ## File lists %find_lang gwenview -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> gwenview.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so + %clean %__rm -rf %{buildroot} @@ -164,6 +144,7 @@ for f in crystalsvg hicolor ; do done /sbin/ldconfig + %postun for f in crystalsvg hicolor ; do touch --no-create %{tde_datadir}/icons/${f} || : @@ -171,11 +152,27 @@ for f in crystalsvg hicolor ; do done /sbin/ldconfig + %files -f gwenview.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO +%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/ +%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/ +%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/ +%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/ +%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/ + %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec index 815b4bf44..9889fe526 100644 --- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec +++ b/redhat/applications/gwenview/gwenview-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp gwenview +%define tde_pkg gwenview +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: Gwenview is an image viewer for KDE. -Version: 1.4.2 -Release: 10%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Gwenview is an image viewer for TDE. +Version: 1.4.2 +Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 # EXIV2 support @@ -84,13 +85,7 @@ KIPI image framework. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -111,9 +106,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -123,29 +122,10 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so + %clean %__rm -rf %{buildroot} @@ -157,6 +137,7 @@ for f in crystalsvg hicolor ; do done /sbin/ldconfig + %postun for f in crystalsvg hicolor ; do touch --no-create %{tde_datadir}/icons/${f} || : @@ -164,6 +145,7 @@ for f in crystalsvg hicolor ; do done /sbin/ldconfig + %files %defattr(-,root,root,-) %doc AUTHORS COPYING @@ -208,6 +190,9 @@ done %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-11 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-10 - Initial release for TDE 3.5.13.2 @@ -232,7 +217,7 @@ done * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3 +* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3 - Import to GIT * Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2 diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec index c43bf768d..384dcdc43 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec @@ -1,9 +1,13 @@ +# Default version for this component +%define tde_pkg k3n-i18n +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -20,14 +24,14 @@ %define _docdir %{tde_docdir} -Name: trinity-k3b-i18n -Summary: Locale files for K3B -Version: 1.0.5 -Release: 3%{?dist}%{?_variant} +Name: trinity-k3b-i18n +Summary: Locale files for K3B +Version: 1.0.5 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ BuildArch: noarch @@ -36,22 +40,26 @@ BuildArch: noarch %define __spec_install_post %{nil} AutoReq: no -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Group: Applications/Archiving -License: GPLv2+ +Group: Applications/Archiving +License: GPLv2+ -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 +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 Requires(post): coreutils Requires(postun): coreutils -Requires: trinity-k3b +Requires: trinity-k3b %description @@ -61,114 +69,264 @@ steps of the burning process the beginner may find comfort in the automatic settings and the reasonable k3b defaults which allow a quick start. -%package da -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Danish (da) translations for K3B [Trinity] -%description da +########## + +%package Danish +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Danish (da) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} +Provides: trinity-k3b-i18n-da = %{version}-%{release} + +%description Danish This package contains the Danish translations for K3B. -%package de -Group: Applications/Archiving -Requires: trinity-k3b -Summary: German (de) translations for K3B [Trinity] -%description de +%files Danish +%defattr(-,root,root,-) +%lang(da) %{tde_tdedocdir}/HTML/da/k3b +%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo + +########## + +%package German +Group: Applications/Archiving +Requires: trinity-k3b +Summary: German (de) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} +Provides: trinity-k3b-i18n-de = %{version}-%{release} + +%description German This package contains the German translations for K3B. -%package el -Group: Applications/Archiving -Requires: trinity-k3b >= %{version} -Summary: Greek (el) translations for K3B [Trinity] -%description el +%files German +%defattr(-,root,root,-) +%lang(de) %{tde_tdedocdir}/HTML/de/k3b +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo + +########## + +%package Greek +Group: Applications/Archiving +Requires: trinity-k3b >= %{version} +Summary: Greek (el) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} +Provides: trinity-k3b-i18n-el = %{version}-%{release} + +%description Greek This package contains the greek translations for K3B. -%package es -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Spanish (es) translations for K3B [Trinity] -%description es +%files Greek +%defattr(-,root,root,-) +#%lang(el) %{tde_tdedocdir}/HTML/el/k3b +%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo + +########## + +%package Spanish +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Spanish (es) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} +Provides: trinity-k3b-i18n-es = %{version}-%{release} + +%description Spanish This package contains the Spanish translations for K3B. -%package et -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Estonian (et) translations for K3B [Trinity] -%description et +%files Spanish +%defattr(-,root,root,-) +%lang(es) %{tde_tdedocdir}/HTML/es/k3b +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo + +########## + +%package Estonian +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Estonian (et) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} +Provides: trinity-k3b-i18n-et = %{version}-%{release} + +%description Estonian This package contains the Estonian translations for K3B. -%package fr -Group: Applications/Archiving -Requires: trinity-k3b -Summary: French (fr) translations for K3B [Trinity] -%description fr +%files Estonian +%defattr(-,root,root,-) +%lang(et) %{tde_tdedocdir}/HTML/et/k3b +%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo + +########## + +%package French +Group: Applications/Archiving +Requires: trinity-k3b +Summary: French (fr) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} +Provides: trinity-k3b-i18n-fr = %{version}-%{release} + +%description French This package contains the French translations for K3B. -%package it -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Italian (it) translations for K3B [Trinity] -%description it +%files French +%defattr(-,root,root,-) +%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo + +########## + +%package Italian +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Italian (it) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} +Provides: trinity-k3b-i18n-it = %{version}-%{release} + +%description Italian This package contains the Italian translations for K3B. -%package nl -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Dutch (nl) translations for K3B [Trinity] -%description nl +%files Italian +%defattr(-,root,root,-) +%lang(it) %{tde_tdedocdir}/HTML/it/k3b +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo + +########## + +%package Dutch +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Dutch (nl) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} +Provides: trinity-k3b-i18n-nl = %{version}-%{release} + +%description Dutch This package contains the Dutch translations for K3B. -%package pl -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Polish (pl) translations for K3B [Trinity] -%description pl +%files Dutch +%defattr(-,root,root,-) +%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo + +########## + +%package Polish +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Polish (pl) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} +Provides: trinity-k3b-i18n-pl = %{version}-%{release} + +%description Polish This package contains the Polish translations for K3B. -%package pt -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Portuguese (pt) translations for K3B [Trinity] -%description pt +%files Polish +%defattr(-,root,root,-) +%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo + +########## + +%package Portuguese +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Portuguese (pt) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} +Provides: trinity-k3b-i18n-pt = %{version}-%{release} + +%description Portuguese This package contains the Portuguese translations for K3B. -%package ptbr -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] -%description ptbr +%files Portuguese +%defattr(-,root,root,-) +%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo + +########## + +%package Brazil +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} +Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} +Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} + +%description Brazil This package contains the Brazilian Portuguese translations for K3B. -%package ru -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Russian (ru) translations for K3B [Trinity] -%description ru +%files Brazil +%defattr(-,root,root,-) +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo + +########## + +%package Russian +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Russian (ru) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} +Provides: trinity-k3b-i18n-ru = %{version}-%{release} + +%description Russian This package contains the Russian translations for K3B. -%package sv -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Swedish (sv) translations for K3B [Trinity] -%description sv +%files Russian +%defattr(-,root,root,-) +%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo + +########## + +%package Swedish +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Swedish (sv) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} +Provides: trinity-k3b-i18n-sv = %{version}-%{release} + +%description Swedish This package contains the Swedish translations for K3B. -%package uk -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Ukrainian (uk) translations for K3B [Trinity] -%description uk -This package contains the Ukrainian translations for K3B. +%files Swedish +%defattr(-,root,root,-) +%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b +%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo +########## -%prep -%setup -q -n %{name}-3.5.13.2 +%package Ukrainian +Group: Applications/Archiving +Requires: trinity-k3b +Summary: Ukrainian (uk) translations for K3B [Trinity] + +Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} +Provides: trinity-k3b-i18n-uk = %{version}-%{release} + +%description Ukrainian +This package contains the Ukrainian translations for K3B. +%files Ukrainian +%defattr(-,root,root,-) +%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b +%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -178,7 +336,6 @@ This package contains the Ukrainian translations for K3B. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" ./configure \ --prefix=%{tde_prefix} \ @@ -189,12 +346,17 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} + %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -245,79 +407,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf %{buildroot} -%files da -%defattr(-,root,root,-) -%lang(da) %{tde_tdedocdir}/HTML/da/k3b -%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo - -%files de -%defattr(-,root,root,-) -%lang(de) %{tde_tdedocdir}/HTML/de/k3b -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo - -%files el -%defattr(-,root,root,-) -#%lang(el) %{tde_tdedocdir}/HTML/el/k3b -%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo - -%files es -%defattr(-,root,root,-) -%lang(es) %{tde_tdedocdir}/HTML/es/k3b -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo - -%files et -%defattr(-,root,root,-) -%lang(et) %{tde_tdedocdir}/HTML/et/k3b -%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo - -%files fr -%defattr(-,root,root,-) -%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo - -%files it -%defattr(-,root,root,-) -%lang(it) %{tde_tdedocdir}/HTML/it/k3b -%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo - -%files nl -%defattr(-,root,root,-) -%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b -%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo - -%files pl -%defattr(-,root,root,-) -%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo - -%files pt -%defattr(-,root,root,-) -%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b -%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo - -%files ptbr -%defattr(-,root,root,-) -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b -%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo - -%files ru -%defattr(-,root,root,-) -%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -%files sv -%defattr(-,root,root,-) -%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo - -%files uk -%defattr(-,root,root,-) -%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b -%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo - - - %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec index 3feb6a38d..b176dc85b 100644 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ b/redhat/applications/k3b/k3b-3.5.13.2.spec @@ -1,9 +1,13 @@ +# Default version for this component +%define tde_pkg k3b +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -20,34 +24,37 @@ %define _docdir %{tde_docdir} -Name: trinity-k3b -Summary: CD/DVD burning application -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: CD/DVD burning application +Epoch: 1 +Version: 1.0.5 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Group: Applications/Archiving -License: GPLv2+ +Group: Applications/Archiving +License: GPLv2+ -Source0: %{name}-3.5.13.2.tar.gz -Source2: k3brc +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source2: k3brc # Legacy RedHat / Fedora patches # manual bufsize (upstream?) -Patch4: k3b-1.0.4-manualbufsize.patch +Patch4: k3b-1.0.4-manualbufsize.patch # RHEL6: Fix K3B icon Patch106: trinity-k3b-icons.patch -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 +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: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: hal-devel @@ -61,15 +68,15 @@ BuildRequires: zlib-devel Requires(post): coreutils Requires(postun): coreutils -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: cdrecord mkisofs -Requires: dvd+rw-tools +Requires: cdrecord mkisofs +Requires: dvd+rw-tools # CDRDAO support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 -Requires: cdrdao +Requires: cdrdao %endif # DBUS support @@ -77,10 +84,10 @@ Requires: cdrdao %if 0%{?rhel} == 4 # Dbus bindings were rebuilt with Qt support BuildRequires: dbus-devel >= 0.22-12.EL.9p1 -Requires: dbus-qt +Requires: dbus-qt >= 0.22-12.EL.9p1 %else -BuildRequires: trinity-dbus-tqt-devel -Requires: trinity-dbus-tqt >= %{version} +BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 +Requires: trinity-dbus-tqt >= 1:0.63 %endif # SNDFILE support @@ -122,10 +129,10 @@ BuildRequires: flac-devel %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 %if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}mad-devel +BuildRequires: %{_lib}mad-devel %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: libmad-devel +BuildRequires: libmad-devel %endif %endif @@ -134,16 +141,16 @@ BuildRequires: libmad-devel %define with_lame 1 %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?pclinuxos} -BuildRequires: liblame-devel +BuildRequires: liblame-devel %else -BuildRequires: %{_lib}lame-devel +BuildRequires: %{_lib}lame-devel %endif %endif %if 0%{?suse_version} -BuildRequires: libmp3lame-devel +BuildRequires: libmp3lame-devel %endif %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lame-devel +BuildRequires: lame-devel %endif %endif @@ -151,10 +158,10 @@ BuildRequires: lame-devel %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_ffmpeg 1 %if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}ffmpeg-devel +BuildRequires: %{_lib}ffmpeg-devel %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel %endif %endif @@ -207,9 +214,9 @@ start. ########## %package common -Summary: Common files of %{name} -Group: Applications/Archiving -Requires: %{name} = %{version}-%{release} +Summary: Common files of %{name} +Group: Applications/Archiving +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} BuildArch: noarch %endif @@ -257,9 +264,9 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ########## %package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Runtime libraries for %{name} +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. @@ -280,9 +287,9 @@ Requires: %{name} = %{version}-%{release} ########## %package devel -Summary: Files for the development of applications which will use %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Summary: Files for the development of applications which will use %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{summary}. @@ -303,9 +310,9 @@ Requires: %{name}-libs = %{version}-%{release} %if 0%{?with_libmad} %package plugin-mad -Summary: The MAD plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: The MAD plugin for K3B +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description plugin-mad %{summary}. @@ -325,9 +332,9 @@ and Layer III a.k.a. MP3) are fully implemented. %if 0%{?with_lame} %package plugin-lame -Summary: The LAME plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: The LAME plugin for K3B +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description plugin-lame %{summary}. @@ -347,9 +354,9 @@ This package is in tainted, as MP3 encoding is covered by software patents. %if 0%{?with_ffmpeg} %package plugin-ffmpeg -Summary: The FFMPEG plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: The FFMPEG plugin for K3B +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description plugin-ffmpeg %{summary}. @@ -373,19 +380,12 @@ and a generic audio and video file converter. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # set in k3brc too %patch4 -p1 -b .manualbufsize %patch106 -p1 -b .desktopfile - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -394,7 +394,6 @@ and a generic audio and video file converter. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # FFMPEG trick ... @@ -402,6 +401,7 @@ if [ -d /usr/include/ffmpeg ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" fi +# Notice: extra-includes is required to find arts headers %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -410,10 +410,17 @@ fi --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility \ + \ + --with-extra-includes=%{tde_includedir} \ + \ --with-k3bsetup=no \ --without-cdrecord-suid-root \ --with-oggvorbis \ @@ -427,8 +434,7 @@ fi %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \ --with-musepack \ --without-resmgr \ - --with-hal \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} + --with-hal # Strange behaviour on RHEL4 ... %if 0%{?rhel} == 4 @@ -449,15 +455,15 @@ export PATH="%{tde_bindir}:${PATH}" # remove the .la files %__rm -f %{buildroot}%{tde_libdir}/libk3b*.la -# remove i18n for Plattdeutsch (Low Saxon) -#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec index b77775b12..bd6788c62 100644 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: DVD backup tool for Trinity Version: 1.2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -47,20 +47,22 @@ Patch3: k9copy-3.5.13.2-use_external_dvdread.patch Patch4: k9copy-3.5.13.2-avcodec.patch 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: trinity-arts-devel >= %{tde_version} BuildRequires: desktop-file-utils + BuildRequires: trinity-k3b-devel # Warning: the target distribution must have ffmpeg ! BuildRequires: ffmpeg-devel Requires: ffmpeg + %description k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). -This is the Trinity version +This is the Trinity version. %if 0%{?suse_version} || 0%{?pclinuxos} @@ -78,12 +80,6 @@ This is the Trinity version # Removes internal dvdread headers %__rm -rf dvdread -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -92,11 +88,10 @@ This is the Trinity version %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # FFMPEG ... if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" + export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" fi # NOTICE: --enable-final causes FTBFS ! @@ -112,9 +107,7 @@ fi --disable-final \ --enable-new-ldflags \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath \ \ --enable-k3bdevices @@ -156,6 +149,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5 - Rebuild with NDEBUG option diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec index e20eb6996..e1e3ded56 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec @@ -7,7 +7,7 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -45,6 +45,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch 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 @@ -78,12 +79,6 @@ when a page containing a supported media format is loaded. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .nspr -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" %__make -f "admin/Makefile.common" @@ -92,7 +87,6 @@ when a page containing a supported media format is loaded. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{_libdir}/mozilla \ @@ -102,7 +96,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath + --enable-rpath %__make %{?_smp_mflags} @@ -136,6 +130,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec index 196e58419..e92892bfe 100644 --- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec +++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: Xine-based media player Version: 0.8.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -36,7 +36,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 # VORBIS support @@ -51,7 +56,7 @@ BuildRequires: libcdda-devel BuildRequires: cdparanoia BuildRequires: cdparanoia-devel %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 19 BuildRequires: libcdio-paranoia-devel %endif @@ -64,7 +69,7 @@ BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 BuildRequires: libXext-devel BuildRequires: libXtst-devel BuildRequires: libXinerama-devel @@ -76,15 +81,15 @@ BuildRequires: libxcb-devel # GSTREAMER support %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_gstreamer 1 -BuildRequires: gstreamer-devel %if 0%{?suse_version} +BuildRequires: gstreamer-devel BuildRequires: gstreamer-0_10-plugins-base-devel %endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: gstreamer-plugins-base-devel >= 0.10 %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -109,10 +114,10 @@ BuildRequires: lame-devel %endif # WTF support -%if 0%{?pclinuxos} == 0 +%if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: kernel-headers %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: glibc-kernheaders %endif @@ -212,12 +217,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -225,7 +224,6 @@ Requires: %{name} = %{version}-%{release} %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR=%{tde_prefix} %configure \ @@ -242,9 +240,7 @@ export KDEDIR=%{tde_prefix} --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath \ \ --with-xinerama \ --with-gstreamer \ @@ -275,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec index 5ce7161d8..b34f34144 100644 --- a/redhat/applications/katapult/katapult-3.5.13.2.spec +++ b/redhat/applications/katapult/katapult-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp katapult +%define tde_pkg katapult +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,30 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: Faster access to applications, bookmarks, and other items. -Version: 0.3.2.1 -Release: 6%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Faster access to applications, bookmarks, and other items. +Version: 0.3.2.1 +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 + %description Katapult is an application for TDE, designed to allow faster access to applications, bookmarks, and other items. It is plugin-based, so it can @@ -60,13 +62,7 @@ inspired by Quicksilver for OS X. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -76,7 +72,6 @@ inspired by Quicksilver for OS X. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -85,9 +80,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -97,7 +96,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{kdecomp} +%find_lang %{tde_pkg} # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/*.so @@ -124,7 +123,7 @@ done update-desktop-database %{tde_appdir} &> /dev/null -%files -f %{kdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/katapult @@ -177,6 +176,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-7 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-6 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec index 99d77f8a8..24a59f391 100644 --- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec +++ b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kbarcode +%define tde_pkg kbarcode +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,28 +24,30 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: barcode and label printing application for Trinity -Version: 2.0.6 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: barcode and label printing application for Trinity +Version: 2.0.6 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.kbarcode.net +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.kbarcode.net -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -58,7 +61,7 @@ batch import of data for batch printing labels (directly from the delivery note), thousands of predefined labels, database management tools and translations in many languages. Even printing more than 10.000 labels in one go is no problem for KBarcode. Data for printing can be imported from several -different data sources, including SQL databases, CSV files and the KDE address +different data sources, including SQL databases, CSV files and the TDE address book. Additionally it is a simple barcode generator (similar to the old xbarcode you @@ -74,13 +77,7 @@ to use them in another application. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -99,8 +96,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{_includedir}/pcre + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ + --with-extra-includes=%{_includedir}/pcre # SMP safe ! %__make %{?_smp_mflags} @@ -112,7 +116,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -%find_lang %{kdecomp} || touch %{kdecomp}.lang +%find_lang %{tde_pkg} @@ -131,7 +135,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : update-desktop-database %{tde_appdir} &> /dev/null -%files -f %{kdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/kbarcode @@ -153,6 +157,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec index a42e59de6..4d176bca1 100644 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kbfx +%define tde_pkg kbfx +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,31 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: an alternative to K-Menu for KDE [Trinity] -Version: 0.4.9.3.1 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: an alternative to K-Menu for TDE [Trinity] +Version: 0.4.9.3.1 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 + %description KBFX is an alternative to the classical K-Menu button and its menu. It improves the user experience by enabling him to set a bigger (and thus more @@ -63,7 +66,7 @@ Homepage: http://www.kbfx.org %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Fix TDE executable path in 'CMakeLists.txt' ... %__sed -i "CMakeLists.txt" \ @@ -75,7 +78,6 @@ Homepage: http://www.kbfx.org unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt" # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then @@ -90,6 +92,13 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ @@ -97,6 +106,7 @@ cd build -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ -DBUILD_DOC=ON \ @@ -165,6 +175,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec index f196d7a0c..e538652b3 100644 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kbookreader +%define tde_pkg kbookreader +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: eBook reader for Trinity. -Version: 0.2.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: eBook reader for Trinity. +Version: 0.2.0 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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 %description @@ -59,13 +60,7 @@ within the Trinity Desktop Environment. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -75,7 +70,6 @@ within the Trinity Desktop Environment. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -84,9 +78,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -97,26 +95,6 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - %clean %__rm -rf %{buildroot} @@ -129,6 +107,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + %files %defattr(-,root,root,-) %doc AUTHORS COPYING @@ -141,9 +120,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/*/apps/bookreader.png - - %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec index 456c6942f..b8e6589e2 100644 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kchmviewer +%define tde_pkg kchmviewer +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,32 +24,34 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: CHM viewer for Trinity -Version: 3.1.2 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: CHM viewer for Trinity +Version: 3.1.2 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +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: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or GNOME. However, it may be compiled +library, and does not depend on TDE or GNOME. However, it may be compiled with full Trinity support, including Trinity widgets and KIO/KHTML. The main advantage of KchmViewer is non-English language support. Unlike @@ -72,13 +75,7 @@ support. Correctly detects and shows encoding of any valid chm file. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -88,13 +85,13 @@ support. Correctly detects and shows encoding of any valid chm file. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{_includedir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# Warning: --enable-final causes FTBFS ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -102,12 +99,16 @@ fi --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath \ + \ --with-x \ - --with-kde \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure - + --with-kde %__make %{?_smp_mflags} @@ -117,7 +118,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{kdecomp} +%find_lang %{tde_pkg} # Removes useless files %__rm -f %{?buildroot}%{tde_libdir}/*.a @@ -135,7 +136,7 @@ touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -%files -f %{kdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING FAQ README %{tde_bindir}/kchmviewer @@ -147,6 +148,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec index e00deb351..9374347cc 100644 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec +++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kchmviewer +%define tde_pkg kchmviewer +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,20 +24,20 @@ %define _docdir %{tde_docdir} -Name: trinity-kcmautostart -Summary: Manage applications automatic startup. -Version: 1.0 -Release: 3%{?dist}%{?_variant} +Name: trinity-kcmautostart +Summary: Manage applications automatic startup. +Version: 1.0 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kcmautostart-3.5.13.tar.gz @@ -49,14 +50,15 @@ Patch3: kcmautostart-3.5.13-fix_crash_on_exit.patch # [kcmautostart] Fix french translation Patch4: kcmautostart-3.5.13-fix_fr_translation.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 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils -BuildRequires: gcc-c++ +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 -Requires: trinity-kdebase +BuildRequires: gcc-c++ + +Requires: trinity-tdebase >= %{tde_version} %description %{summary} @@ -73,10 +75,7 @@ Requires: trinity-kdebase %patch3 -p1 -b .crash_on_exit %patch4 -p1 -b .fr_translation -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -87,7 +86,6 @@ Requires: trinity-kdebase %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -96,9 +94,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --disable-static + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -110,6 +112,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang autostart + %clean %__rm -rf %{buildroot} @@ -124,6 +127,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4 +- Build for Fedora 19 + * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec index e9da08b8a..a5374081e 100644 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp kcpuload +%define tde_pkg kcpuload +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -15,7 +16,7 @@ %define tde_mandir %{tde_datadir}/man %define tde_appdir %{tde_datadir}/applications -%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdeappdir %{tde_appdir}/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: a CPU meter for Kicker [Trinity] -Version: 2.00 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: a CPU meter for Kicker [Trinity] +Version: 2.00 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -62,13 +65,7 @@ KCPULoad has support for SMP and separate user/system loads. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -78,7 +75,6 @@ KCPULoad has support for SMP and separate user/system loads. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -87,8 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -127,6 +128,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-5 +- Initial release for TDE 3.5.13.1 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec index d371d5669..521f14897 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec @@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg} Summary: a DBUS notification service [Trinity] Version: 0.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -45,10 +45,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-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: gtk2-devel %if 0%{?suse_version} @@ -71,12 +72,6 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,9 +95,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath %__make %{?_smp_mflags} @@ -127,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5 - Fix UTF8 messages diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec index 8fdcde01b..92c2bf2a8 100644 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec @@ -16,7 +16,7 @@ %define tde_mandir %{tde_datadir}/man %define tde_appdir %{tde_datadir}/applications -%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdeappdir %{tde_appdir}/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. Version: 0.9.91 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -42,11 +42,12 @@ 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 >= %{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 + %description Shows the differences line by line and character by character (!). Provides an automatic merge-facility and @@ -63,12 +64,6 @@ Unicode & UTF-8 support %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -77,7 +72,6 @@ Unicode & UTF-8 support %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -93,9 +87,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath %__make %{?_smp_mflags} @@ -106,10 +98,12 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} # Unwanted files +# These are not HTML files but weird files in wrong place ?? %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ %find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} @@ -147,6 +141,9 @@ done %{tde_tdelibdir}/libkdiff3plugin.so %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-8 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7 - Rebuild with NDEBUG option diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec index 260526dc0..be40fd152 100644 --- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec +++ b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kdirstat +%define tde_pkg kdirstat +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,32 +24,34 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: graphical disk usage display with cleanup facilities [Trinity] -Version: 2.4.4 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: graphical disk usage display with cleanup facilities [Trinity] +Version: 2.4.4 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description -KDirStat (KDE Directory Statistics) is a small utility program that sums +KDirStat (TDE Directory Statistics) is a small utility program that sums up disk usage for directory trees, very much like the Unix 'du' command. It displays the disk space used up by a directory tree, both numerically and graphically. It is network transparent (i.e., you can use it to sum @@ -64,13 +67,7 @@ own cleanup actions. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -80,7 +77,6 @@ own cleanup actions. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -90,8 +86,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -102,9 +103,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - -%find_lang %{tdecomp} - +%find_lang %{tde_pkg} %clean @@ -124,7 +123,7 @@ for f in hicolor locolor; do done -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kdirstat %{tde_datadir}/applnk/Utilities/kdirstat.desktop @@ -137,6 +136,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec index 029952029..c8b439979 100644 --- a/redhat/applications/keep/keep-3.5.13.2.spec +++ b/redhat/applications/keep/keep-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp keep +%define tde_pkg keep +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,30 +24,32 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: backup system for KDE [Trinity] -Version: 0.4.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: backup system for TDE [Trinity] +Version: 0.4.0 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 -Requires: rdiff-backup +Requires: rdiff-backup %description Keep is an automatic backup program that allows users to set the parameters of @@ -61,13 +64,7 @@ Homepage: http://jr.falleri.free.fr/keep %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -87,8 +84,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -98,7 +100,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -115,7 +117,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : update-desktop-database %{tde_appdir} &> /dev/null -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/keep %{tde_tdelibdir}/kded_keep.la @@ -129,6 +131,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec index 08edc9c77..aa9fc4ce4 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kgtk-qt3 +%define tde_pkg kgtk-qt3 +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Use KDE dialogs in Gtk apps -Version: 0.10.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Use TDE dialogs in Gtk apps +Version: 0.10.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -52,7 +55,7 @@ This is an LD_PRELOAD hack that allows most GTK applications to use Trinity's file dialogs when run under Trinity. The Gtk file chooser functions have been overridden to communicate -with this KDE module/application. +with this TDE module/application. This package includes the kqt3-wrapper @@ -63,24 +66,13 @@ This package includes the kqt3-wrapper %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -find . -name CMakeLists.txt -exec sed -i {} \ - -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ - -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ - -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ - \; +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build cd build @@ -88,17 +80,24 @@ cd build %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ -DBUILD_ALL=ON \ .. # SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install @@ -131,6 +130,9 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" %{tde_datadir}/kgtk/preload %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec index be360bd6d..320b18726 100644 --- a/redhat/applications/kile/kile-3.5.13.2.spec +++ b/redhat/applications/kile/kile-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Integrated LaTeX Environment [Trinity] Version: 2.0.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Publishing @@ -42,9 +42,11 @@ 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 Obsoletes: %{name}-i18n-ar @@ -116,12 +118,6 @@ Kile can support large projects consisting of several smaller files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -130,7 +126,6 @@ Kile can support large projects consisting of several smaller files. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -140,15 +135,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - \ + \ --disable-dependency-tracking \ --disable-debug \ --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath %__make %{?_smp_mflags} @@ -204,6 +197,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-7 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6 - Rebuild with NDEBUG option diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec index bbe41cc74..840d1c1bf 100644 --- a/redhat/applications/kima/kima-3.5.13.2.spec +++ b/redhat/applications/kima/kima-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kima +%define tde_pkg kima +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: kicker monitoring applet [Trinity] -Version: 0.7.3.2 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: kicker monitoring applet [Trinity] +Version: 0.7.3.2 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.elliptique.net/~ken/kima/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 # HAL support @@ -66,13 +69,7 @@ panel. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -82,7 +79,6 @@ panel. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -98,9 +94,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir} + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -112,7 +106,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} @@ -120,7 +114,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_tdelibdir}/libkima.la @@ -130,6 +124,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec index 2d5d8bb0e..d37887fe3 100644 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Version: 1.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Summary: tool to configure the TDE kiosk framework License: GPLv2+ @@ -40,8 +40,13 @@ URL: http://www.trinitydesktop.org/ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext +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 %description @@ -58,12 +63,6 @@ groups of users. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -72,8 +71,6 @@ groups of users. %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - %configure \ --prefix=%{tde_prefix} \ @@ -89,10 +86,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ - + --enable-rpath + %__make %{?_smp_mflags} @@ -133,6 +128,9 @@ update-desktop-database >& /dev/null ||: %{tde_datadir}/apps/kiosktool/kiosktoolui.rc %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5 - Rebuild with NDEBUG option diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec index 9ac088547..85470704d 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: media player for Trinity Version: 0.10.0c -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -42,6 +42,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 @@ -87,7 +88,7 @@ BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-libXv-devel %endif -Requires: %{name}-base +Requires: %{name}-base = %{version}-%{release} %description A basic audio/video viewer application for Trinity. @@ -116,7 +117,8 @@ Core files needed for KMPlayer. %package konq-plugins Group: Applications/Multimedia -Requires: trinity-kmplayer-base, trinity-kdebase +Requires: %{name}-base = %{version}-%{release} +Requires: trinity-tdebase >= %{tde_version} Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] %description konq-plugins @@ -143,12 +145,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -157,7 +153,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %configure \ @@ -174,11 +169,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install @@ -257,6 +250,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec index 6e2f52062..2bb53f516 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kmyfirewall +%define tde_pkg kmyfirewall +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,26 +24,27 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: iptables based firewall configuration tool for KDE [Trinity] -Version: 1.1.1 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: iptables based firewall configuration tool for TDE [Trinity] +Version: 1.1.1 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -73,13 +75,7 @@ Requires: %{name} = %{version}-%{release} %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -89,7 +85,6 @@ Requires: %{name} = %{version}-%{release} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -99,9 +94,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -197,6 +196,9 @@ done %{tde_libdir}/libkmfwidgets.so %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec index 0667d5ce0..972e753e9 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec @@ -41,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: personal finance manager for TDE Version: 1.0.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -66,7 +66,7 @@ Patch4: kmymoney-3.5.13-missing_ldflags.patch Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-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 @@ -74,12 +74,6 @@ BuildRequires: desktop-file-utils BuildRequires: recode BuildRequires: libofx-devel -# PDF support -%if 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} -%define with_pdf 1 -BuildRequires: html2ps -%endif - # OPENSP support %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?pclinuxos} @@ -136,18 +130,12 @@ This package contains development files needed for KMyMoney plugins. %patch5 -p1 -b .qtpluginsdir %endif -%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 +%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19 %__cp /usr/share/automake-1.13/test-driver admin/ %endif %__install -m644 %{SOURCE1} kmymoney2/widgets/ -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -156,7 +144,6 @@ This package contains development files needed for KMyMoney plugins. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export KDEDIR="%{tde_prefix}" @@ -170,7 +157,7 @@ export QTPLUGINS="%{_libdir}/qt3/plugins" grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po %endif -# NOTICE: --enable-final causes FTBFS ! +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -185,11 +172,9 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po --enable-new-ldflags \ --disable-final \ --enable-closure \ - --disable-rpath \ + --enable-rpath \ \ - --with-extra-includes=%{tde_includedir}/tqt \ - \ - %{?with_pdf:--enable-pdf-docs} %{?!with_pdf:--disable-pdf-docs} \ + --disable-pdf-docs \ --enable-ofxplugin \ --enable-ofxbanking \ --enable-qtdesigner \ @@ -280,6 +265,9 @@ done %{qt3pluginsdir}/designer/libkmymoney.so %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5 - Rebuild with NDEBUG option diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec index e82a328a2..cbad92895 100644 --- a/redhat/applications/knemo/knemo-3.5.13.2.spec +++ b/redhat/applications/knemo/knemo-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knemo +%define tde_pkg knemo +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: network interfaces monitor for the Trinity systray -Version: 0.4.8 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: network interfaces monitor for the Trinity systray +Version: 0.4.8 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://beta.smileaf.org/projects -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %if 0%{?fedora} >= 18 @@ -70,13 +73,7 @@ Homepage: http://extragear.kde.org/apps/knemo/ %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -96,8 +93,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -137,6 +139,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec index 95a255ade..99fd0807b 100644 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ b/redhat/applications/knetload/knetload-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knetload +%define tde_pkg knetload +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,32 +24,34 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: a network meter for Kicker [Trinity] -Version: 2.3 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: a network meter for Kicker [Trinity] +Version: 2.3 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description -KNetLoad is a small network meter for Kicker (the KDE panel). It shows +KNetLoad is a small network meter for Kicker (the TDE panel). It shows a recent history of network usage in the form of two configurable diagrams in the system tray, one for incoming and one for outgoing data. These diagrams have settings for colours and various different @@ -63,13 +66,7 @@ KNetLoad can monitor just about any network device. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -79,7 +76,6 @@ KNetLoad can monitor just about any network device. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -89,8 +85,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -101,7 +102,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} @@ -124,7 +125,7 @@ for f in crystalsvg locolor ; do done -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knetload %{tde_tdeappdir}/knetload.desktop @@ -134,6 +135,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec index a1cadd729..af57bf9ca 100644 --- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec +++ b/redhat/applications/knetstats/knetstats-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knetstats +%define tde_pkg knetstats +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,32 +24,34 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: network interfaces monitor for the Trinity systray -Version: 1.6.1 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: network interfaces monitor for the Trinity systray +Version: 1.6.1 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description -A simple KDE network monitor that show rx/tx LEDs of any +A simple TDE network monitor that show rx/tx LEDs of any network interface on a system tray icon @@ -58,13 +61,7 @@ network interface on a system tray icon %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -74,7 +71,6 @@ network interface on a system tray icon %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -84,8 +80,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -96,7 +97,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} @@ -115,7 +116,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knetstats %{tde_tdeappdir}/knetstats.desktop @@ -125,6 +126,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec index be11af866..a203605a9 100644 --- a/redhat/applications/knights/knights-3.5.13.2.spec +++ b/redhat/applications/knights/knights-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knights +%define tde_pkg knights +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: A chess interface for the K Desktop Environment [Trinity] -Version: 0.6 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A chess interface for the K Desktop Environment [Trinity] +Version: 0.6 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Amusements/Games +License: GPLv2+ +Group: Amusements/Games -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Requires: gnuchess @@ -69,13 +72,7 @@ Here's a quick list of Knights' key features: %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -85,8 +82,8 @@ Here's a quick list of Knights' key features: %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -95,8 +92,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -106,7 +108,8 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} @@ -121,7 +124,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knights %{tde_datadir}/applnk/Games/Board/knights.desktop @@ -132,6 +135,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec index 8dbbf544d..4b8dd9f47 100644 --- a/redhat/applications/knowit/knowit-3.5.13.2.spec +++ b/redhat/applications/knowit/knowit-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knowit +%define tde_pkg knowit +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,34 +24,36 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Tool for managing notes [Trinity] -Version: 0.10 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Tool for managing notes [Trinity] +Version: 0.10 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description KnowIt is a tool for managing notes which are organized in tree-like hierarchy. It is similar to TuxCards, -but KDE-based, and requires Trinity. +but TDE-based, and requires Trinity. %if 0%{?suse_version} || 0%{?pclinuxos} @@ -59,13 +62,7 @@ but KDE-based, and requires Trinity. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -77,6 +74,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -85,8 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -102,7 +105,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -r %{buildroot}%{tde_datadir}/applnk -%find_lang %{tdecomp} +%find_lang %{tde_pkg} @@ -121,7 +124,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knowit %{tde_tdeappdir}/knowit.desktop @@ -135,6 +138,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec index 54843f70f..6be2584e8 100644 --- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec +++ b/redhat/applications/knutclient/knutclient-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp knutclient +%define tde_pkg knutclient +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,28 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] +Version: 0.9.5 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.knut.noveradsl.cz/knutclient/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.knut.noveradsl.cz/knutclient/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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 %description @@ -60,13 +62,7 @@ stations using an UPS. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -76,7 +72,6 @@ stations using an UPS. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -86,9 +81,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -98,7 +97,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -117,7 +116,7 @@ for f in hicolor locolor; do done -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/knutclient @@ -130,6 +129,9 @@ done %{tde_datadir}/icons/locolor/*/apps/*.png %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec index 023fafa5b..6492d4393 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec @@ -1,9 +1,13 @@ +# Default version for this component +%define tde_pkg koffice-i18n +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -20,516 +24,520 @@ %define _docdir %{tde_docdir} # Builds all supported languages (not unsupported ones) -%if "%{?KDE_LANGS}" == "" -%define KDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW +%if "%{?TDE_LANGS}" == "" +%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW %endif -Name: trinity-koffice-i18n -Summary: Internationalization support for Trinity -Version: 1.6.3 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Internationalization support for Trinity +Version: 1.6.3 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch +License: GFDL +Group: User Interface/Desktops +BuildArch: noarch # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} AutoReq: no -Source0: %{name}-3.5.13.2.tar.gz +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: findutils BuildRequires: gettext BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 %description %{summary}. %package Bulgarian -Summary: Bulgarian(bg) language support for TDE -Group: User Interface/Desktops +Summary: Bulgarian(bg) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bg = %{version}-%{release} %description Bulgarian %{summary}. %package Bengali -Summary: Bengali(bn) language support for TDE -Group: User Interface/Desktops +Summary: Bengali(bn) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bn = %{version}-%{release} %description Bengali %{summary}. %package Tibetan -Summary: Tibetan(bo) language support for TDE -Group: User Interface/Desktops +Summary: Tibetan(bo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bo = %{version}-%{release} %description Tibetan %{summary}. %package Breton -Summary: Breton(br) language support for TDE -Group: User Interface/Desktops +Summary: Breton(br) language support for TDE +Group: User Interface/Desktops Provides: %{name}-br = %{version}-%{release} %description Breton %{summary}. %package Bosnian -Summary: Bosnian(bs) language support for TDE -Group: User Interface/Desktops +Summary: Bosnian(bs) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bs = %{version}-%{release} %description Bosnian %{summary}. %package Catalan -Summary: Catalan(ca) language support for TDE -Group: User Interface/Desktops +Summary: Catalan(ca) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ca = %{version}-%{release} %description Catalan %{summary}. %package Czech -Summary: Czech(cs) language support for TDE -Group: User Interface/Desktops +Summary: Czech(cs) language support for TDE +Group: User Interface/Desktops Provides: %{name}-cs = %{version}-%{release} %description Czech %{summary}. %package Cymraeg -Summary: Cymraeg language support for TDE -Group: User Interface/Desktops +Summary: Cymraeg language support for TDE +Group: User Interface/Desktops %description Cymraeg %{summary}. %package Welsh -Summary: Welsh(cy) language support for TDE -Group: User Interface/Desktops +Summary: Welsh(cy) language support for TDE +Group: User Interface/Desktops Provides: %{name}-cy = %{version}-%{release} %description Welsh %{summary}. %package Danish -Summary: Danish(da) language support for TDE -Group: User Interface/Desktops +Summary: Danish(da) language support for TDE +Group: User Interface/Desktops Provides: %{name}-da = %{version}-%{release} %description Danish %{summary}. %package German -Summary: German(de) language support for TDE -Group: User Interface/Desktops +Summary: German(de) language support for TDE +Group: User Interface/Desktops Provides: %{name}-de = %{version}-%{release} %description German %{summary}. %package Greek -Summary: Greek(el) language support for TDE -Group: User Interface/Desktops +Summary: Greek(el) language support for TDE +Group: User Interface/Desktops Provides: %{name}-el = %{version}-%{release} %description Greek %{summary}. %package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops +Summary: British(en_GB) English support for TDE +Group: User Interface/Desktops Provides: %{name}-en_GB = %{version}-%{release} %description British %{summary}. %package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops +Summary: Esperanto(eo) support for TDE +Group: User Interface/Desktops Provides: %{name}-eo = %{version}-%{release} %description Esperanto %{summary}. %package Spanish -Summary: Spanish(es) language support for TDE -Group: User Interface/Desktops +Summary: Spanish(es) language support for TDE +Group: User Interface/Desktops Provides: %{name}-es = %{version}-%{release} %description Spanish %{summary}. %package Estonian -Summary: Estonian(et) language support for TDE -Group: User Interface/Desktops +Summary: Estonian(et) language support for TDE +Group: User Interface/Desktops Provides: %{name}-et = %{version}-%{release} %description Estonian %{summary}. %package Basque -Summary: Basque(eu) language support for TDE -Group: User Interface/Desktops +Summary: Basque(eu) language support for TDE +Group: User Interface/Desktops Provides: %{name}-eu = %{version}-%{release} %description Basque %{summary}. %package Finnish -Summary: Finnish(fi) language support for TDE -Group: User Interface/Desktops +Summary: Finnish(fi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fi = %{version}-%{release} %description Finnish %{summary}. %package Faroese -Summary: Faroese(fo) language support for TDE -Group: User Interface/Desktops +Summary: Faroese(fo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fo = %{version}-%{release} %description Faroese %{summary}. %package French -Summary: French(fr) language support for TDE -Group: User Interface/Desktops +Summary: French(fr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fr = %{version}-%{release} %description French %{summary}. %package Frisian -Summary: Frisian(fy) language support for TDE -Group: User Interface/Desktops +Summary: Frisian(fy) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fy = %{version}-%{release} %description Frisian %{summary}. %package Irish -Summary: Irish(ga) language support for TDE -Group: User Interface/Desktops +Summary: Irish(ga) language support for TDE +Group: User Interface/Desktops Obsoletes: kde-i18n-Gaeilge < %{version} Provides: %{name}-ga = %{version}-%{release} %description Irish %{summary}. %package Galician -Summary: Galician(gl) language support for TDE -Group: User Interface/Desktops +Summary: Galician(gl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-gl = %{version}-%{release} %description Galician %{summary}. %package Hebrew -Summary: Hebrew(he) language support for TDE -Group: User Interface/Desktops +Summary: Hebrew(he) language support for TDE +Group: User Interface/Desktops Provides: %{name}-he = %{version}-%{release} %description Hebrew %{summary}. %package Hindi -Summary: Hindi(hi) language support for TDE -Group: User Interface/Desktops +Summary: Hindi(hi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hi = %{version}-%{release} %description Hindi %{summary}. %package Croatian -Summary: Croatian(hr) language support for TDE -Group: User Interface/Desktops +Summary: Croatian(hr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hr = %{version}-%{release} %description Croatian %{summary}. %package Hungarian -Summary: Hungarian(hu) language support for TDE -Group: User Interface/Desktops +Summary: Hungarian(hu) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hu = %{version}-%{release} %description Hungarian %{summary}. %package Indonesian -Summary: Indonesian(id) language support for TDE -Group: User Interface/Desktops +Summary: Indonesian(id) language support for TDE +Group: User Interface/Desktops Provides: %{name}-id = %{version}-%{release} %description Indonesian %{summary}. %package Icelandic -Summary: Icelandic(is) language support for TDE -Group: User Interface/Desktops +Summary: Icelandic(is) language support for TDE +Group: User Interface/Desktops Provides: %{name}-is = %{version}-%{release} %description Icelandic %{summary}. %package Italian -Summary: Italian(it) language support for TDE -Group: User Interface/Desktops +Summary: Italian(it) language support for TDE +Group: User Interface/Desktops Provides: %{name}-it = %{version}-%{release} %description Italian %{summary}. %package Japanese -Summary: Japanese(ja) language support for TDE -Group: User Interface/Desktops +Summary: Japanese(ja) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ja = %{version}-%{release} %description Japanese %{summary}. %package Khmer -Summary: Khmer(km) language support for TDE -Group: User Interface/Desktops +Summary: Khmer(km) language support for TDE +Group: User Interface/Desktops Provides: %{name}-km = %{version}-%{release} %description Khmer %{summary}. %package Korean -Summary: Korean(ko) language support for TDE -Group: User Interface/Desktops +Summary: Korean(ko) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ko = %{version}-%{release} %description Korean %{summary}. %package Kurdish -Summary: Kurdish(ku) language support for TDE -Group: User Interface/Desktops +Summary: Kurdish(ku) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ku = %{version}-%{release} %description Kurdish %{summary}. %package Lao -Summary: Lao(lo) language support for TDE -Group: User Interface/Desktops +Summary: Lao(lo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lo = %{version}-%{release} %description Lao %{summary}. %package Lithuanian -Summary: Lithuanian(lt) language support for TDE -Group: User Interface/Desktops +Summary: Lithuanian(lt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lt = %{version}-%{release} %description Lithuanian %{summary}. %package Latvian -Summary: Latvian(lv) language support for TDE -Group: User Interface/Desktops +Summary: Latvian(lv) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lv = %{version}-%{release} %description Latvian %{summary}. %package Maori -Summary: Maori(mi) language support for TDE -Group: User Interface/Desktops +Summary: Maori(mi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mi = %{version}-%{release} %description Maori %{summary}. %package Macedonian -Summary: Macedonian(mk) language support for TDE -Group: User Interface/Desktops +Summary: Macedonian(mk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mk = %{version}-%{release} %description Macedonian %{summary}. %package Malay -Summary: Malay(ms) language support for TDE -Group: User Interface/Desktops +Summary: Malay(ms) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ms = %{version}-%{release} %description Malay %{summary}. %package Maltese -Summary: Maltese(mt) language support for TDE -Group: User Interface/Desktops +Summary: Maltese(mt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mt = %{version}-%{release} %description Maltese %{summary}. %package LowSaxon -Summary: Low Saxon (nds) language support for TDE -Group: User Interface/Desktops +Summary: Low Saxon (nds) language support for TDE +Group: User Interface/Desktops Provides: %{name}-nds = %{version}-%{release} %description LowSaxon %{summary}. %package Nepali -Summary: Nepali(ne) language support for TDE -Group: User Interface/Desktops +Summary: Nepali(ne) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ne = %{version}-%{release} %description Nepali %{summary}. %package Dutch -Summary: Dutch(nl) language support for TDE -Group: User Interface/Desktops +Summary: Dutch(nl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-nl = %{version}-%{release} %description Dutch %{summary}. %package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for TDE -Group: User Interface/Desktops +Summary: Norwegian(no) (Bokmaal) language support for TDE +Group: User Interface/Desktops Provides: %{name}-no = %{version}-%{release} %description Norwegian %{summary}. %package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for TDE -Group: User Interface/Desktops +Summary: Norwegian(nn) (Nynorsk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-nn = %{version}-%{release} %description Norwegian-Nynorsk %{summary}. %package Occitan -Summary: Occitan(oc) language support for TDE -Group: User Interface/Desktops +Summary: Occitan(oc) language support for TDE +Group: User Interface/Desktops Provides: %{name}-oc = %{version}-%{release} %description Occitan %{summary}. %package Polish -Summary: Polish(pl) language support for TDE -Group: User Interface/Desktops +Summary: Polish(pl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pl = %{version}-%{release} %description Polish %{summary}. %package Portuguese -Summary: Portuguese(pt) language support for TDE -Group: User Interface/Desktops +Summary: Portuguese(pt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pt = %{version}-%{release} %description Portuguese %{summary}. %package Punjabi -Summary: Punjabi(pa) language support for TDE -Group: User Interface/Desktops +Summary: Punjabi(pa) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pa = %{version}-%{release} %description Punjabi %{summary}. %package Brazil -Summary: Brazil(pt_BR) Portuguese language support for TDE -Group: User Interface/Desktops +Summary: Brazil(pt_BR) Portuguese language support for TDE +Group: User Interface/Desktops Provides: %{name}-pt_BR = %{version}-%{release} %description Brazil %{summary}. %package Romanian -Summary: Romanian(ro) language support for TDE -Group: User Interface/Desktops +Summary: Romanian(ro) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ro = %{version}-%{release} %description Romanian %{summary}. %package Russian -Summary: Russian(ru) language support for TDE -Group: User Interface/Desktops +Summary: Russian(ru) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ru = %{version}-%{release} %description Russian %{summary}. %package Slovak -Summary: Slovak(sk) language support for TDE -Group: User Interface/Desktops +Summary: Slovak(sk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sk = %{version}-%{release} %description Slovak %{summary}. %package Slovenian -Summary: Slovenian(sl) language support for TDE -Group: User Interface/Desktops +Summary: Slovenian(sl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sl = %{version}-%{release} %description Slovenian %{summary}. %package Serbian -Summary: Serbian(sr) language support for TDE -Group: User Interface/Desktops +Summary: Serbian(sr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sr = %{version}-%{release} %description Serbian %{summary}. %package Swedish -Summary: Swedish(sv) language support for TDE -Group: User Interface/Desktops +Summary: Swedish(sv) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sv = %{version}-%{release} %description Swedish %{summary}. %package Tamil -Summary: Tamil(ta) language support for TDE -Group: User Interface/Desktops +Summary: Tamil(ta) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ta = %{version}-%{release} %description Tamil %{summary}. %package Tajik -Summary: Tajik(tg) language support for TDE -Group: User Interface/Desktops +Summary: Tajik(tg) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tg = %{version}-%{release} %description Tajik %{summary}. %package Thai -Summary: Thai(th) language support for TDE -Group: User Interface/Desktops +Summary: Thai(th) language support for TDE +Group: User Interface/Desktops Provides: %{name}-th = %{version}-%{release} %description Thai %{summary}. %package Turkish -Summary: Turkish(tr) language support for TDE -Group: User Interface/Desktops +Summary: Turkish(tr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tr = %{version}-%{release} %description Turkish %{summary}. %package Ukrainian -Summary: Ukrainian(uk) language support for TDE -Group: User Interface/Desktops +Summary: Ukrainian(uk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-uk = %{version}-%{release} %description Ukrainian %{summary}. %package Venda -Summary: Venda(ven) language support for TDE -Group: User Interface/Desktops +Summary: Venda(ven) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ven = %{version}-%{release} %description Venda %{summary}. %package Vietnamese -Summary: Vietnamese(vi) language support for TDE -Group: User Interface/Desktops +Summary: Vietnamese(vi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-vi = %{version}-%{release} %description Vietnamese %{summary}. %package Walloon -Summary: Walloon(wa) language support for TDE -Group: User Interface/Desktops +Summary: Walloon(wa) language support for TDE +Group: User Interface/Desktops Provides: %{name}-wa = %{version}-%{release} %description Walloon %{summary}. %package Xhosa -Summary: Xhosa(xh) (a Bantu language) support for TDE -Group: User Interface/Desktops +Summary: Xhosa(xh) (a Bantu language) support for TDE +Group: User Interface/Desktops Provides: %{name}-xh = %{version}-%{release} %description Xhosa %{summary}. %package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE -Group: User Interface/Desktops +Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE +Group: User Interface/Desktops Provides: %{name}-zh_CN = %{version}-%{release} %description Chinese %{summary}. %package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for TDE -Group: User Interface/Desktops +Summary: Chinese(zh_TW) (Big5) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tz_TW = %{version}-%{release} %description Chinese-Big5 %{summary}. @@ -537,13 +545,7 @@ Provides: %{name}-tz_TW = %{version}-%{release} %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -555,7 +557,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export kde_htmldir="%{tde_tdedocdir}/HTML" -for l in %{KDE_LANGS}; do +for l in %{TDE_LANGS}; do for f in koffice-i18n-${l}/; do if [ -d "${f}" ]; then pushd ${f} @@ -575,7 +577,7 @@ done %__rm -rf %{?buildroot} export PATH="%{tde_bindir}:${PATH}" -for l in %{KDE_LANGS}; do +for l in %{TDE_LANGS}; do for f in koffice-i18n-${l}/; do if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then %__make install DESTDIR="%{?buildroot}" -C "${f}" @@ -622,61 +624,61 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %clean %__rm -rf %{buildroot} -%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w af <<< '%{TDE_LANGS}' )" != "" %files Afrikaans %defattr(-,root,root,-) %lang(af) %{tde_datadir}/locale/af/* %endif -%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != "" %files Arabic %defattr(-,root,root,-) %lang(ar) %{tde_datadir}/locale/ar/* %endif -%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w az <<< '%{TDE_LANGS}' )" != "" %files Azerbaijani %defattr(-,root,root,-) %lang(az) %{tde_datadir}/locale/az/* %endif -%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w be <<< '%{TDE_LANGS}' )" != "" %files Belarusian %defattr(-,root,root,-) %lang(be) %{tde_datadir}/locale/be/* %endif -%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != "" %files Bulgarian %defattr(-,root,root,-) %lang(bg) %{tde_datadir}/locale/bg/* %endif -%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != "" %files Bengali %defattr(-,root,root,-) %lang(bn) %{tde_datadir}/locale/bn/* %endif -%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != "" %files Tibetan %defattr(-,root,root,-) %lang(bo) %{tde_datadir}/locale/bo/* %endif -%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w br <<< '%{TDE_LANGS}' )" != "" %files Breton %defattr(-,root,root,-) %lang(br) %{tde_datadir}/locale/br/* %endif -%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != "" %files Bosnian %defattr(-,root,root,-) %lang(bs) %{tde_datadir}/locale/bs/* %endif -%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != "" %files Catalan %defattr(-,root,root,-) %lang(ca) %{tde_datadir}/locale/ca/* @@ -684,27 +686,27 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(ca) %{tde_datadir}/apps/koffice/autocorrect/ca.xml %endif -%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" %files Czech %defattr(-,root,root,-) %lang(cs) %{tde_datadir}/locale/cs/* %lang(cs) %{tde_datadir}/apps/koffice/autocorrect/cs.xml %endif -%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != "" %files Welsh %defattr(-,root,root,-) %lang(cy) %{tde_datadir}/locale/cy/* %endif -%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w da <<< '%{TDE_LANGS}' )" != "" %files Danish %defattr(-,root,root,-) %lang(da) %{tde_datadir}/locale/da/* %lang(da) %{tde_tdedocdir}/HTML/da/ %endif -%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w de <<< '%{TDE_LANGS}' )" != "" %files German %defattr(-,root,root,-) %lang(de) %{tde_datadir}/locale/de/* @@ -712,26 +714,26 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(de) %{tde_datadir}/apps/koffice/autocorrect/de.xml %endif -%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w el <<< '%{TDE_LANGS}' )" != "" %files Greek %defattr(-,root,root,-) %lang(el) %{tde_datadir}/locale/el/* %endif -%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != "" %files British %defattr(-,root,root,-) %lang(en_GB) %{tde_datadir}/locale/en_GB/* %lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/ %endif -%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != "" %files Esperanto %defattr(-,root,root,-) %lang(eo) %{tde_datadir}/locale/eo/* %endif -%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w es <<< '%{TDE_LANGS}' )" != "" %files Spanish %defattr(-,root,root,-) %lang(es) %{tde_datadir}/locale/es/* @@ -739,38 +741,38 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(es) %{tde_datadir}/apps/koffice/autocorrect/es.xml %endif -%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w et <<< '%{TDE_LANGS}' )" != "" %files Estonian %defattr(-,root,root,-) %lang(et) %{tde_datadir}/locale/et/* %lang(et) %{tde_tdedocdir}/HTML/et/ %endif -%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != "" %files Basque %defattr(-,root,root,-) %lang(eu) %{tde_datadir}/locale/eu/* %endif -%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != "" %files Farsi %defattr(-,root,root,-) %lang(fa) %{tde_datadir}/locale/fa/* %endif -%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != "" %files Finnish %defattr(-,root,root,-) %lang(fi) %{tde_datadir}/locale/fi/* %endif -%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != "" %files Faroese %defattr(-,root,root,-) %lang(fo) %{tde_datadir}/locale/fo/* %endif -%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != "" %files French %defattr(-,root,root,-) %lang(fr) %{tde_datadir}/locale/fr/* @@ -778,62 +780,62 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(fr) %{tde_datadir}/apps/koffice/autocorrect/fr.xml %endif -%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != "" %files Frisian %defattr(-,root,root,-) %lang(fy) %{tde_datadir}/locale/fy/* %endif -%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != "" %files Irish %defattr(-,root,root,-) %lang(ga) %{tde_datadir}/locale/ga/* %endif -%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != "" %files Galician %defattr(-,root,root,-) %lang(gl) %{tde_datadir}/locale/gl/* %endif -%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w he <<< '%{TDE_LANGS}' )" != "" %files Hebrew %defattr(-,root,root,-) %lang(he) %{tde_datadir}/locale/he/* %endif -%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != "" %files Hindi %defattr(-,root,root,-) %lang(hi) %{tde_datadir}/locale/hi/* %endif -%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != "" %files Croatian %defattr(-,root,root,-) %lang(hr) %{tde_datadir}/locale/hr/* %endif -%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" %files Hungarian %defattr(-,root,root,-) %lang(hu) %{tde_datadir}/locale/hu/* %lang(hu) %{tde_datadir}/apps/koffice/autocorrect/hu.xml %endif -%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" %files Indonesian %defattr(-,root,root,-) %lang(id) %{tde_datadir}/locale/id/* %endif -%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w is <<< '%{TDE_LANGS}' )" != "" %files Icelandic %defattr(-,root,root,-) %lang(is) %{tde_datadir}/locale/is/* %endif -%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w it <<< '%{TDE_LANGS}' )" != "" %files Italian %defattr(-,root,root,-) %lang(it) %{tde_datadir}/locale/it/* @@ -841,149 +843,149 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(it) %{tde_datadir}/apps/koffice/autocorrect/it.xml %endif -%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" %files Japanese %defattr(-,root,root,-) %lang(ja) %{tde_datadir}/locale/ja/* %endif -%if "%( grep -w km <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w km <<< '%{TDE_LANGS}' )" != "" %files Khmer %defattr(-,root,root,-) %lang(km) %{tde_datadir}/locale/km/* %endif -%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" %files Korean %defattr(-,root,root,-) %lang(ko) %{tde_datadir}/locale/ko/* %endif -%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" %files Kurdish %defattr(-,root,root,-) %lang(ku) %{tde_datadir}/locale/ku/* %endif -%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" %files Lao %defattr(-,root,root,-) %lang(lo) %{tde_datadir}/locale/lo/* %endif -%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != "" %files Lithuanian %defattr(-,root,root,-) %lang(lt) %{tde_datadir}/locale/lt/* %endif -%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) %lang(lv) %{tde_datadir}/locale/lv/* %endif -%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != "" %files Maori %defattr(-,root,root,-) %lang(mi) %{tde_datadir}/locale/mi/* %endif -%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != "" %files Macedonian %defattr(-,root,root,-) %lang(mk) %{tde_datadir}/locale/mk/* %endif -%if "%( grep -w ms <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != "" %files Malay %defattr(-,root,root,-) %lang(ms) %{tde_datadir}/locale/ms/* %endif -%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != "" %files Maltese %defattr(-,root,root,-) %lang(mt) %{tde_datadir}/locale/mt/* %endif -%if "%( grep -w nds <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != "" %files LowSaxon %defattr(-,root,root,-) %lang(nds) %{tde_datadir}/locale/nds/* %endif -%if "%( grep -w ne <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != "" %files Nepali %defattr(-,root,root,-) %lang(ne) %{tde_datadir}/locale/ne/* %endif -%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != "" %files Dutch %defattr(-,root,root,-) %lang(nl) %{tde_datadir}/locale/nl/* %lang(nl) %{tde_tdedocdir}/HTML/nl/ %endif -%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != "" %files Norwegian %defattr(-,root,root,-) %lang(nb) %{tde_datadir}/locale/nb/* %endif -%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" %files Norwegian-Nynorsk %defattr(-,root,root,-) %lang(nn) %{tde_datadir}/locale/nn/* %endif -%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != "" %files Occitan %defattr(-,root,root,-) %lang(oc) %{tde_datadir}/locale/oc/* %endif -%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != "" %files Punjabi %defattr(-,root,root,-) %lang(pa) %{tde_datadir}/locale/pa/* %endif -%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != "" %files Polish %defattr(-,root,root,-) %lang(pl) %{tde_datadir}/locale/pl/* %endif -%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != "" %files Portuguese %defattr(-,root,root,-) %lang(pt) %{tde_datadir}/locale/pt/* %lang(pt) %{tde_tdedocdir}/HTML/pt/ %endif -%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != "" %files Brazil %defattr(-,root,root,-) %lang(pt_BR) %{tde_datadir}/locale/pt_BR/* %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/ %endif -%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != "" %files Romanian %defattr(-,root,root,-) %lang(ro) %{tde_datadir}/locale/ro/* %endif -%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != "" %files Russian %defattr(-,root,root,-) %lang(ru) %{tde_datadir}/locale/ru/* %lang(ru) %{tde_tdedocdir}/HTML/ru/ %endif -%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != "" %files Slovak %defattr(-,root,root,-) %lang(sk) %{tde_datadir}/locale/sk/* @@ -991,93 +993,96 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %lang(sk) %{tde_datadir}/apps/koffice/autocorrect/sk.xml %endif -%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != "" %files Slovenian %defattr(-,root,root,-) %lang(sl) %{tde_datadir}/locale/sl/* %lang(sl) %{tde_tdedocdir}/HTML/sl/ %endif -%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != "" %files Serbian %defattr(-,root,root,-) %lang(sr) %{tde_datadir}/locale/sr/* %endif -%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != "" %files Swedish %defattr(-,root,root,-) %lang(sv) %{tde_datadir}/locale/sv/* %lang(sv) %{tde_tdedocdir}/HTML/sv/ %endif -%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != "" %files Tamil %defattr(-,root,root,-) %lang(ta) %{tde_datadir}/locale/ta/* %endif -%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != "" %files Tajik %defattr(-,root,root,-) %lang(tg) %{tde_datadir}/locale/tg/* %endif -%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w th <<< '%{TDE_LANGS}' )" != "" %files Thai %defattr(-,root,root,-) %lang(th) %{tde_datadir}/locale/th/* %endif -%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != "" %files Turkish %defattr(-,root,root,-) %lang(tr) %{tde_datadir}/locale/tr/* %endif -%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" %files Ukrainian %defattr(-,root,root,-) %lang(uk) %{tde_datadir}/locale/uk/* %endif -%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != "" %files Venda %defattr(-,root,root,-) %lang(ven) %{tde_datadir}/locale/ven/* %endif -%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != "" %files Vietnamese %defattr(-,root,root,-) %lang(vi) %{tde_datadir}/locale/vi/* %endif -%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != "" %files Walloon %defattr(-,root,root,-) %lang(wa) %{tde_datadir}/locale/wa/* %endif -%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != "" %files Xhosa %defattr(-,root,root,-) %lang(xh) %{tde_datadir}/locale/xh/* %endif -%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" %files Chinese %defattr(-,root,root,-) %lang(zh_CN) %{tde_datadir}/locale/zh_CN/* %endif -%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" %files Chinese-Big5 %defattr(-,root,root,-) %lang(zh_TW) %{tde_datadir}/locale/zh_TW/* %endif %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec index e942636bf..5e23a4fe8 100644 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/koffice-3.5.13.2.spec @@ -41,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: An integrated office suite Version: 1.6.3 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} Group: Applications/Productivity License: GPLv2+ @@ -55,9 +55,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch # BuildRequires: world-devel ;) +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: trinity-tdegraphics-devel >= %{tde_version} BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version} BuildRequires: automake libtool @@ -72,7 +78,6 @@ BuildRequires: python-devel BuildRequires: pcre-devel BuildRequires: gettext-devel BuildRequires: mysql-devel -BuildRequires: desktop-file-utils BuildRequires: perl BuildRequires: doxygen BuildRequires: aspell-devel @@ -140,6 +145,7 @@ BuildRequires: libutempter-devel # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} %define with_postgresql 1 +BuildRequires: postgresql-devel BuildRequires: libpqxx-devel %endif Obsoletes: trinity-libpqxx @@ -230,7 +236,6 @@ Summary: Core support files for %{name} Group: Applications/Productivity Requires: %{name}-libs = %{version}-%{release} Requires: perl -Conflicts: koffice-i18n < %{version} %description core %{summary}. @@ -1055,8 +1060,9 @@ This package is part of the TDE Office Suite. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .ftbfs -%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 +%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19 %__cp /usr/share/automake-1.13/test-driver admin/ %endif @@ -1066,12 +1072,6 @@ This package is part of the TDE Office Suite. -e 's|dejavu sans|dejavu lgc sans|' \ lib/kformula/{contextstyle,fontstyle,symboltable}.cc -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1080,7 +1080,6 @@ This package is part of the TDE Office Suite. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export KDEDIR="%{tde_prefix}" @@ -1097,26 +1096,34 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath --disable-dependency-tracking \ + \ + --disable-dependency-tracking \ --disable-debug \ --enable-new-ldflags \ - --disable-debug --disable-warnings \ - --with-pic --enable-shared --disable-static \ - --with-extra-libs=%{tde_libdir} \ --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \ --enable-closure \ + --enable-rpath \ + \ + --with-extra-libs=%{tde_libdir} \ + --with-extra-includes=%{tde_includedir}/arts \ + \ --disable-kexi-macros \ %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Moves menu elements to XDG folder +desktop-file-install \ + --dir=%{buildroot}%{tde_tdeappdir} \ + --vendor="" \ + --delete-original \ + %{buildroot}%{tde_datadir}/applnk/Office/*.desktop # Replace absolute symlinks with relative ones pushd %{buildroot}%{tde_tdedocdir}/HTML @@ -1131,20 +1138,6 @@ for lang in *; do done popd -desktop-file-install \ - --dir=%{buildroot}%{tde_tdeappdir} \ - --vendor="" \ - --delete-original \ - %{buildroot}%{tde_datadir}/applnk/Office/*.desktop - -## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061) -## until http://bugzilla.redhat.com/245190 is fixed -%if 0%{?rhel} || 0%{?fedora} -for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do - grep "^NoDisplay=" ${desktop_file} || \ - echo "NoDisplay=True" >> ${desktop_file} -done -%endif ## unpackaged files # fonts @@ -1174,6 +1167,9 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-9 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-7 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec index ac7cce336..8043497d9 100644 --- a/redhat/applications/konversation/konversation-3.5.13.2.spec +++ b/redhat/applications/konversation/konversation-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp konversation +%define tde_pkg konversation +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,28 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] -Version: 1.1 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] +Version: 1.1 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 BuildRequires: libxslt-devel @@ -90,13 +92,7 @@ and experienced users alike will appreciate its many features: %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -106,7 +102,6 @@ and experienced users alike will appreciate its many features: %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -116,9 +111,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -128,7 +127,8 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} @@ -143,7 +143,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/konversation @@ -177,6 +177,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec index d0f676d0a..74b353a6e 100644 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec +++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec @@ -1,5 +1,6 @@ # Default version for this component -%define tdecomp kopete-otr +%define tde_pkg kopete-otr +%define tde_version 3.5.13.2 # Required for Mageia 2: removes the ldflag '--no-undefined' %define _disable_ld_no_undefined 1 @@ -11,7 +12,7 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -28,31 +29,33 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Off-The-Record encryption for Kopete [Trinity] +Version: 0.7 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: trinity-tdenetwork-devel >= 3.5.13.2 +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: trinity-tdenetwork-devel >= %{tde_version} + # Kopete is provided by kdenetwork -Requires: trinity-kopete >= 3.5.13.2 +Requires: trinity-kopete >= %{tde_version} %if 0%{?suse_version} >= 1230 BuildRequires: libotr2-devel %else @@ -60,7 +63,7 @@ BuildRequires: libotr-devel %endif %description -This plugin enables Off-The-Record encryption for the KDE instant +This plugin enables Off-The-Record encryption for the TDE instant messenger Kopete. Using this plugin you can encrypt chatsessions to other users with IM-Cients supporting the OTR encryption method. @@ -71,13 +74,7 @@ users with IM-Cients supporting the OTR encryption method. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -87,7 +84,6 @@ users with IM-Cients supporting the OTR encryption method. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -97,12 +93,17 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{_smp_mflags} + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} @@ -113,6 +114,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang kopete_otr + %clean %__rm -rf %{buildroot} @@ -147,6 +149,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec index 09d643b7f..2dc0c7831 100644 --- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec +++ b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kpicosim +%define tde_pkg kpicosim +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,33 +24,35 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] -Version: 0.6a -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] +Version: 0.6a +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description kpicosim is a development environment for the Xilinx -PicoBlaze-3 soft-core processor for the KDE Desktop (Linux). +PicoBlaze-3 soft-core processor for the TDE Desktop (Linux). The environment has an editor with syntax highlighting, compiler, simulator and export functions to VHDL, HEX and MEM files. @@ -60,13 +63,7 @@ simulator and export functions to VHDL, HEX and MEM files. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -78,6 +75,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -86,8 +84,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir} + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -99,10 +102,6 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} || touch %{tdecomp}.lang - - - %clean %__rm -rf %{buildroot} @@ -116,7 +115,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{tde_bindir}/kpicosim @@ -128,6 +127,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec index 2e5385bf5..6491fd244 100644 --- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec +++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Palm Pilot hot-sync tool Version: 0.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -43,11 +43,12 @@ 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 +BuildRequires: gettext BuildRequires: pilot-link-devel BuildRequires: trinity-tdepim-devel >= %{tde_version} @@ -66,12 +67,6 @@ and synchronize the built-in applications with their TDE counterparts. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -80,7 +75,6 @@ and synchronize the built-in applications with their TDE counterparts. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -96,9 +90,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir} + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -182,6 +174,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5 - Rebuild with NDEBUG option diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec index 60f32e769..456078a83 100644 --- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec +++ b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp kpowersave -%define tdeversion 3.5.13.2 +%define tde_pkg kpowersave +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -24,30 +24,32 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Version: 0.7.3 -Release: 4%{?dist}%{?_variant} -Summary: HAL based power management applet for Trinityfiles or directories. +Name: trinity-%{tde_pkg} +Version: 0.7.3 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Summary: HAL based power management applet for Trinityfiles or directories. -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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: hal-devel -BuildRequires: trinity-dbus-tqt-devel +BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %description @@ -87,12 +89,11 @@ settings for: %prep -%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" - export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} @@ -101,12 +102,21 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ + -DBUILD_ALL=ON \ .. %__make %{?_smp_mflags} @@ -151,6 +161,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config/kpowersaverc %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec index 33048ac5e..c3e967f63 100644 --- a/redhat/applications/krename/krename-3.5.13.2.spec +++ b/redhat/applications/krename/krename-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp krename +%define tde_pkg krename +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,28 +24,30 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: A TDE batch file renaming utility. -Version: 3.0.14 -Release: 6%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A TDE batch file renaming utility. +Version: 3.0.14 +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 + %description KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or even more files in one go. The filenames can be created by parts of the original filename, @@ -57,13 +60,7 @@ or Exif informations of an image. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -73,7 +70,6 @@ or Exif informations of an image. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -83,9 +79,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -95,7 +95,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean @@ -116,7 +116,7 @@ for f in hicolor locolor ; do done update-desktop-database %{tde_appdir} &> /dev/null -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/krename @@ -130,6 +130,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-7 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-6 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec index 49967cddc..cf43135d4 100644 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ b/redhat/applications/krusader/krusader-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp krusader +%define tde_pkg krusader +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,33 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: twin-panel (commander-style) file manager for KDE (and other desktops) -Version: 1.90.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: twin-panel (commander-style) file manager for TDE (and other desktops) +Version: 1.90.0 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: trinity-tdebindings-devel >= 3.5.13.2 +Patch0: krusader-3.5.13.2-ftbfs.patch + +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: trinity-tdebindings-devel >= %{tde_version} + %description Krusader is a simple, easy, powerful, twin-panel (commander-style) file @@ -73,13 +78,8 @@ great on your desktop. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -89,8 +89,8 @@ great on your desktop. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -99,8 +99,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -110,7 +115,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -131,7 +136,7 @@ for f in crystalsvg locolor ; do done -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING FAQ README TODO %{tde_bindir}/krusader @@ -152,6 +157,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec index 60daa21ec..207ac815b 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp ksplash-engine-moodin +%define tde_pkg ksplash-engine-moodin +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: fading splash screen engine for Trinity -Version: 0.4.2 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: fading splash screen engine for Trinity +Version: 0.4.2 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 @@ -71,13 +74,7 @@ Homepage: http://moodwrod.com %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -87,7 +84,6 @@ Homepage: http://moodwrod.com %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -97,8 +93,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -123,6 +124,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec index 5a9e16495..733644295 100644 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec +++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp ksquirrel +%define tde_pkg ksquirrel +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,30 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Powerful Trinity image viewer +Version: 0.8.0 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Amusements/Games +License: GPLv2+ +Group: Amusements/Games -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 +BuildRequires: gettext BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel #BuildRequires: libkexif-devel @@ -55,7 +57,7 @@ KSquirrel is an image viewer for TDE with disk navigator, file tree, multiple directory view, thumbnails, extended thumbnails, dynamic format support, DCOP interface, KEXIF and KIPI plugins support. -KSquirrel is a fast and convenient image viewer for KDE featuring +KSquirrel is a fast and convenient image viewer for TDE featuring OpenGL and dynamic format support. @@ -65,13 +67,7 @@ OpenGL and dynamic format support. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -81,13 +77,13 @@ OpenGL and dynamic format support. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -96,8 +92,13 @@ fi --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -107,7 +108,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -124,7 +125,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO %{tde_bindir}/ksquirrel @@ -148,6 +149,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_mandir}/man1/ksquirrel.1 %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec index 3ed53876f..5e54222d0 100644 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kstreamripper +%define tde_pkg kstreamripper +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,30 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: TDE frontend for streamripper +Name: trinity-%{tde_pkg} +Summary: TDE frontend for streamripper -Version: 0.3.4 -Release: 3%{?dist}%{?_variant} +Version: 0.3.4 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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: scons @@ -62,17 +64,14 @@ you with managing/ripping your preferred streams. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__sed -i kde.py \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ -e "s|include/kde|include/tde|g" %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - scons -Q -j4 \ qtlibs=${QTLIB:-${QTDIR}/%{_lib}} @@ -84,31 +83,10 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - %clean %__rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{tde_bindir}/kstreamripper @@ -119,6 +97,9 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec index af4ac36f6..bbf8a68bc 100644 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec +++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp ksystemlog +%define tde_pkg ksystemlog +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,28 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: system log viewer tool for Trinity -Version: 0.3.2 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: system log viewer tool for Trinity +Version: 0.3.2 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/System +License: GPLv2+ +Group: Applications/System -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ksystemlog.forum-software.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://ksystemlog.forum-software.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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 %description @@ -62,13 +64,7 @@ quickly see problems occuring on their server. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -78,7 +74,6 @@ quickly see problems occuring on their server. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -88,9 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -126,6 +125,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec index cf1dcb302..95b225c77 100644 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec +++ b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp ktechlab +%define tde_pkg ktechlab +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,31 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: circuit simulator for microcontrollers and electronics [Trinity] -Version: 0.3 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: circuit simulator for microcontrollers and electronics [Trinity] +Version: 0.3 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +Patch0: ktechlab-3.5.13.2-ftbfs.patch + +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 @@ -61,13 +66,8 @@ Homepage: http://ktechlab.org/ %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -77,8 +77,8 @@ Homepage: http://ktechlab.org/ %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -87,8 +87,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -98,7 +103,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -113,7 +118,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/ktechlab %{tde_bindir}/microbe @@ -130,6 +135,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec index b4e302a1e..b4c76217d 100644 --- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec +++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp ktorrent +%define tde_pkg ktorrent +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,30 +24,47 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: BitTorrent client for Trinity -Version: 2.2.8 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: BitTorrent client for Trinity +Version: 2.2.8 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ktorrent.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://ktorrent.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 +# AVAHI support +# Disabled on RHEL4 and RHEL5 +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: trinity-avahi-tqt-devel +Requires: trinity-avahi-tqt +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%else +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + %description KTorrent is a BitTorrent program for Trinity. Its features include speed capping @@ -61,13 +79,7 @@ enabling background downloading. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -77,7 +89,6 @@ enabling background downloading. %build unset QTDIR; . "/etc/profile.d/qt3.sh" export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix="%{tde_prefix}" \ @@ -87,8 +98,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir="%{tde_libdir}" \ --mandir="%{tde_mandir}" \ --includedir="%{tde_tdeincludedir}" \ - --disable-rpath \ - --with-extra-includes="%{tde_includedir}/tqt" + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath \ + \ + %{?!with_avahi:--without-avahi} # Not SMP safe ! @@ -100,7 +118,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf "%{buildroot}" %__make install DESTDIR="%{buildroot}" -%find_lang %{tdecomp} +%find_lang %{tde_pkg} # Unwanted files %__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so" @@ -123,7 +141,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : /sbin/ldconfig || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/ktcachecheck %{tde_bindir}/ktorrent @@ -162,8 +180,16 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/services/*.desktop %{tde_datadir}/servicetypes/ktorrentplugin.desktop +%if 0%{?with_avahi} +%{tde_tdelibdir}/ktzeroconfplugin.la +%{tde_tdelibdir}/ktzeroconfplugin.so +%endif + %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec index daea3460d..9e08d202f 100644 --- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec +++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: Quick picture viewer for TDE Version: 0.8.13 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -41,6 +41,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 @@ -66,12 +67,6 @@ Clicking on an image shows the image in its normal size. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -80,7 +75,6 @@ Clicking on an image shows the image in its normal size. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -93,12 +87,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" \ --disable-dependency-tracking \ --disable-debug \ - --enable-new-ldflags \ --enable-final \ + --enable-new-ldflags \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-rpath %__make %{?_smp_mflags} @@ -126,18 +118,21 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING -%{tde_bindir}/* +%{tde_bindir}/kuickshow %{tde_datadir}/applications/*/*.desktop -%{tde_datadir}/apps/*/ +%{tde_datadir}/apps/kuickshow/ %{tde_datadir}/icons/hicolor/*/*/* -%{tde_libdir}/lib[kt]deinit_%{tde_pkg}.so +%{tde_libdir}/libkdeinit_%{tde_pkg}.so %{tde_libdir}/*.la %{tde_tdelibdir}/*.so %{tde_tdelibdir}/*.la -%{tde_tdedocdir}/HTML/en/*/ +%{tde_tdedocdir}/HTML/en/kuickshow/ %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-8 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7 - Rebuild with NDEBUG option diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec index 44c8a3598..8fa752273 100644 --- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec +++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec @@ -1,14 +1,15 @@ # REMOVE KDELIBS4-DEVEL before building !!!! # Default version for this component -%define tdecomp kvirc +%define tde_pkg kvirc +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -25,50 +26,53 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Trinity based next generation IRC client with module support -Version: 3.4.0 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Trinity based next generation IRC client with module support +Version: 3.4.0 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kvirc.net/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://kvirc.net/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [kvirc] Modules do not install in correct folder [RHEL/Fedora] -Patch0: kvirc-3.5.13.2-fix_ftbfs.patch +Patch0: kvirc-3.5.13.2-fix_ftbfs.patch # [kvirc] FTBFS because of missing link libraries [Bug #991] -Patch1: kvirc-3.5.13-ftbfs.patch +Patch1: kvirc-3.5.13-ftbfs.patch +Patch2: kvirc-14.0.0-install_directory.patch -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{version}-%{release} %description A highly configurable graphical IRC client with an MDI interface, built-in scripting language, support for IRC DCC, drag & drop file -browsing, and much more. KVIrc uses the KDE widget set, can be extended -using its own scripting language, integrates with KDE, and supports +browsing, and much more. KVIrc uses the TDE widget set, can be extended +using its own scripting language, integrates with TDE, and supports custom plugins. If you are a developer and you want to write a custom module for KVIrc, you need to install the kvirc-dev package. %package data -Group: Applications/Utilities -Summary: Data files for KVIrc -Requires: %{name} = %{version}-%{release} +Group: Applications/Utilities +Summary: Data files for KVIrc +Requires: %{name} = %{version}-%{release} %description data This package contains the architecture-independent data needed by KVIrc in @@ -78,19 +82,19 @@ within KVIrc in its internal help format. Unless you want to use KVIrc only as a very simple IRC client you are likely to want to write scripts to tailor KVIrc to your needs. -KVIrc is a graphical IRC client based on the KDE widget set which integrates -with the K Desktop Environment version 3. +KVIrc is a graphical IRC client based on the TDE widget set which integrates +with the Trinity Desktop Environment version 3. %package devel -Group: Development/Libraries -Summary: Development files for KVIrc -Requires: %{name} = %{version}-%{release} +Group: Development/Libraries +Summary: Development files for KVIrc +Requires: %{name} = %{version}-%{release} %description devel This package contains KVIrc libraries and include files you need if you want to develop plugins for KVIrc. -KVIrc is a graphical IRC client based on the KDE widget set which integrates +KVIrc is a graphical IRC client based on the TDE widget set which integrates with the K Desktop Environment version 3. @@ -100,15 +104,10 @@ with the K Desktop Environment version 3. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 %patch1 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%patch2 -p1 -b .installdir # Hardcoded absolute PATH to KDEDIR in source code ! That sucks ! %__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \ @@ -124,7 +123,6 @@ with the K Desktop Environment version 3. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR=%{tde_prefix} %configure \ @@ -135,18 +133,22 @@ export KDEDIR=%{tde_prefix} --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-fno-rtti --with-aa-fonts --with-big-channels \ - --enable-perl --with-pic --enable-wall \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-wall \ + \ + --with-pic \ + \ + --with-big-channels \ + --enable-perl \ --with-ix86-asm \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} \ --with-kde-services-dir=%{tde_datadir}/services \ --with-kde-library-dir=%{tde_libdir} \ --with-kde-include-dir=%{tde_tdeincludedir} \ --with-qt-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \ --with-qt-include-dir=${QTINC:-${QTDIR}/include} \ - --with-qt-moc=${QTDIR}/bin/moc \ - --enable-closure + --with-qt-moc=${QTDIR}/bin/moc # Symbolic links must exist prior to parallel building %__make symlinks -C src/kvilib/build @@ -162,8 +164,9 @@ export PATH="%{tde_bindir}:${PATH}" # Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ... %__mv \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA + %{?buildroot}%{tde_libdir}/kvirc/3.4/license/COPYING \ + %{?buildroot}%{tde_libdir}/kvirc/3.4/license/EULA + %clean %__rm -rf %{buildroot} @@ -185,18 +188,18 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %doc ChangeLog FAQ README TODO %{tde_bindir}/kvirc %{tde_libdir}/*.so.* -#%{tde_libdir}/kvirc/*/modules/*.so +%{tde_libdir}/kvirc/*/modules/*.so %files data %defattr(-,root,root,-) %{tde_bindir}/kvi_run_netscape %{tde_bindir}/kvi_search_help -#%{tde_libdir}/kvirc/*/modules/caps/ +%{tde_libdir}/kvirc/ %{tde_datadir}/applnk/Internet/kvirc.desktop %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz %{tde_datadir}/icons/hicolor/*/*/*.xpm -%{tde_datadir}/kvirc +#%{tde_datadir}/kvirc %{tde_datadir}/mimelnk/text/*.desktop %{tde_datadir}/services/*.protocol %{tde_mandir}/man1/kvirc.1 @@ -211,6 +214,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec index bebd592b9..763f674f2 100644 --- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec +++ b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp kvkbd +%define tde_pkg kvkbd +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,31 +24,32 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: Virtual keyboard for KDE [Trinity] -Version: 0.4.8 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Virtual keyboard for TDE [Trinity] +Version: 0.4.8 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/System +License: GPLv2+ +Group: Applications/System -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://pan4os.info/main/index.php +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://pan4os.info/main/index.php -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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 %description -Virtual keyboard for KDE for use with accessibility. Application contains +Virtual keyboard for TDE for use with accessibility. Application contains a systray widget as well as a dockwidget. @@ -57,13 +59,7 @@ a systray widget as well as a dockwidget. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -83,9 +79,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -120,6 +120,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec index 6e1ad5c29..b8866b682 100644 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ b/redhat/applications/piklab/piklab-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp piklab +%define tde_pkg piklab +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,29 +24,30 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: IDE for PIC-microcontroller development [Trinity] +Version: 0.15.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 +BuildRequires: gettext BuildRequires: readline-devel %description @@ -64,13 +66,7 @@ are supported. A command-line programmer and debugger are also available. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -80,8 +76,8 @@ are supported. A command-line programmer and debugger are also available. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -90,8 +86,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -104,7 +105,7 @@ export PATH="%{tde_bindir}:${PATH}" # Incorrect extension on manpage %__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -121,7 +122,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/piklab %{tde_bindir}/piklab-coff @@ -143,6 +144,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec index 76023d7da..25db4b67d 100644 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ b/redhat/applications/potracegui/potracegui-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp potracegui +%define tde_pkg potracegui +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,32 +24,33 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: KDE frontend for potrace [Trinity] -Version: 1.3 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: TDE frontend for potrace [Trinity] +Version: 1.3 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Multimedia +License: GPLv2+ +Group: Applications/Multimedia -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://potracegui.sourceforge.net -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description -A KDE interface for the commandline tracing tools potrace and/or autotrace. It -supports drag and drop as well as all image types recognized by KDE, which are +A TDE interface for the commandline tracing tools potrace and/or autotrace. It +supports drag and drop as well as all image types recognized by TDE, which are a lot more than the 4 recognized by the potrace commandline tool. Loading of remote files (web, ftp, ...) is also supported. @@ -59,13 +61,7 @@ remote files (web, ftp, ...) is also supported. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -75,7 +71,6 @@ remote files (web, ftp, ...) is also supported. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -85,9 +80,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -126,6 +125,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec index 8e03ccf02..a4ef6f5dd 100644 --- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec +++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec @@ -30,7 +30,7 @@ Name: trinity-%{tde_pkg} Summary: music editor and MIDI/audio sequencer [Trinity] Version: 1.7.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -45,11 +45,12 @@ 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 +BuildRequires: gettext BuildRequires: fftw-devel BuildRequires: liblo-devel BuildRequires: fontconfig-devel @@ -121,17 +122,13 @@ This package provides the data files necessary for running Rosegarden %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Hard-coded path to TQT binaries spotted !!! -%__sed -i CMakeLists.txt \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" %build unset QTDIR && . %{_sysconfdir}/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" + export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}" +export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}" %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build @@ -139,13 +136,12 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ - -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWANT_DEBUG=OFF \ - -DWANT_FULLDBG=OFF \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ @@ -159,6 +155,8 @@ cd build %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \ -DWANT_PCH=OFF \ -DWANT_TEST=OFF \ + -DWANT_DEBUG=OFF \ + -DWANT_FULLDBG=OFF \ -DBUILD_ALL=ON \ .. @@ -221,6 +219,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5 - Rebuild with NDEBUG option @@ -230,7 +231,7 @@ done * Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3 - Initial release for TDE 3.5.13.1 -* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2 +* Fri Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2 - Updated to build with gcc 4.7. [Commit #15276f36] - Enables JACK support diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec index 79cf16813..e7c9a8b1d 100644 --- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec +++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp smartcardauth +%define tde_pkg smartcardauth +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,28 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: SmartCard Login and LUKS Decrypt, Setup Utility -Version: 1.0 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: SmartCard Login and LUKS Decrypt, Setup Utility +Version: 1.0 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/System +License: GPLv2+ +Group: Applications/System -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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: perl-PAR-Packer %if 0%{?mgaversion} || 0%{?mdkversion} @@ -77,21 +79,14 @@ in addition to the PKCS certificate functionality %prep -unset QTDIR; . /etc/profile.d/qt3.sh -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "src/Makefile" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|/usr/include/qt3|${QTINC}|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__sed -i "Makefile" \ - -e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g" + -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" + %build export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" ./build_ckpasswd @@ -146,6 +141,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec index 9e37d98a9..353bd9ae8 100644 --- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec +++ b/redhat/applications/smb4k/smb4k-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp smb4k +%define tde_pkg smb4k +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,38 +24,39 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: A Samba (SMB) share advanced browser for Trinity -Version: 0.9.4 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A Samba (SMB) share advanced browser for Trinity +Version: 0.9.4 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description -Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software +Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software suite to access the SMB shares of the local network neighborhood. Its purpose is to provide a program that's easy to use and has as many features as possible. -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/smb4k %{tde_bindir}/smb4k_cat @@ -129,13 +131,7 @@ Requires: %{name} = %{version}-%{release} %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -145,7 +141,6 @@ Requires: %{name} = %{version}-%{release} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR="%{tde_prefix}" @@ -157,9 +152,13 @@ export KDEDIR="%{tde_prefix}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath # SMP safe ! %__make %{?_smp_mflags} @@ -170,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean @@ -178,6 +177,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec index f8d9faa30..ef5605ff3 100644 --- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec +++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec @@ -1,5 +1,6 @@ # Default version for this component -%define tdecomp soundkonverter +%define tde_pkg soundkonverter +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -23,27 +24,28 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: audio converter frontend for Trinity -Version: 0.3.8 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: audio converter frontend for Trinity +Version: 0.3.8 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Application/Multimedia +License: GPLv2+ +Group: Application/Multimedia -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://potracegui.sourceforge.net -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils +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 %description @@ -83,13 +85,7 @@ See the 'soundkonverter-trinity' package for more information. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -99,7 +95,6 @@ See the 'soundkonverter-trinity' package for more information. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -109,9 +104,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath \ + \ + --with-extra-includes=/usr/include/cdda %__make %{?_smp_mflags} @@ -121,7 +122,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} @@ -138,7 +139,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/soundkonverter @@ -173,6 +174,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec index 9a1561ec0..df4779921 100644 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec @@ -1,3 +1,7 @@ +# Default version for this component +%define tde_pkg tde-guidance +%define tde_version 3.5.13.2 + # REMOVE KDELIBS4-DEVEL before building !!!! %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -7,7 +11,7 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -25,33 +29,33 @@ %define __arch_install_post %{nil} -Name: trinity-tde-guidance -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: 6%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: A collection of system administration tools for Trinity +Version: 0.8.0svn20080103 +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/guidance +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.simonzone.com/software/guidance -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: trinity-tde-guidance-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [tde-guidance] Work around mountconfig incorrectly handling LABEL tag # This resolves Bug 1545 # Add ext4 support -Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch +Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel @@ -87,7 +91,6 @@ BuildRequires: PyQt-devel Requires: PyQt %endif - Requires: trinity-python-trinity Requires: trinity-pytdeextensions Requires: %{name}-backends = %{version}-%{release} @@ -97,10 +100,8 @@ Requires: hwdata %endif -%if "%{tde_prefix}" == "/usr" -Conflicts: guidance-power-manager -Conflicts: kde-guidance-powermanager -%endif +# POWERMANAGER support (requires HAL) +%define with_powermanager 1 Obsoletes: trinity-guidance < %{version}-%{release} Provides: trinity-guidance = %{version}-%{release} @@ -116,15 +117,70 @@ look after your system: These tools are available in Trinity Control Center, System Settings or can be run as standalone applications. +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING README TODO +#%{tde_bindir}/displayconfig +#%{tde_bindir}/displayconfig-restore +%{tde_bindir}/grubconfig +%{tde_bindir}/mountconfig +%{tde_bindir}/serviceconfig +%{tde_bindir}/userconfig +%{tde_bindir}/wineconfig +%attr(0644,root,root) %{tde_tdelibdir}/*.so +%attr(0644,root,root) %{tde_tdelibdir}/*.la +%{tde_datadir}/apps/guidance/ +%{tde_tdeappdir}/*.desktop +%{tde_datadir}/icons/crystalsvg/*/*/*.png +%{tde_datadir}/icons/crystalsvg/*/*/*.svg +%{python_sitearch}/%{name}/SMBShareSelectDialog.py* +%{python_sitearch}/%{name}/SimpleCommandRunner.py* +%{python_sitearch}/%{name}/fuser.py* +%{python_sitearch}/%{name}/fuser_ui.py* +%{python_sitearch}/%{name}/grubconfig.py* +%{python_sitearch}/%{name}/ktimerdialog.py* +%{python_sitearch}/%{name}/mountconfig.py* +%{python_sitearch}/%{name}/servertestdialog.py* +%{python_sitearch}/%{name}/serviceconfig.py* +%{python_sitearch}/%{name}/sizeview.py* +%{python_sitearch}/%{name}/unixauthdb.py* +%{python_sitearch}/%{name}/userconfig.py* +%{python_sitearch}/%{name}/wineconfig.py* +%{tde_tdedocdir}/HTML/en/guidance/ + +# Files from backends +%exclude %{tde_datadir}/apps/guidance/vesamodes +%exclude %{tde_datadir}/apps/guidance/extramodes +%exclude %{tde_datadir}/apps/guidance/widescreenmodes +%exclude %{tde_datadir}/apps/guidance/Cards+ +%exclude %{tde_datadir}/apps/guidance/pcitable +%exclude %{tde_datadir}/apps/guidance/MonitorsDB + +# Files from powermanager +%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png +%exclude %{tde_datadir}/apps/guidance/pics/battery*.png +%exclude %{tde_datadir}/apps/guidance/pics/processor.png + +%post +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%postun +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : +########## %package backends -Group: Applications/Utilities -Summary: collection of system administration tools for GNU/Linux [Trinity] +Group: Applications/Utilities +Summary: collection of system administration tools for GNU/Linux [Trinity] %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata +Requires: hwdata %endif -Requires: python +Requires: python Obsoletes: trinity-guidance-backends < %{version}-%{release} Provides: trinity-guidance-backends = %{version}-%{release} @@ -133,42 +189,105 @@ Provides: trinity-guidance-backends = %{version}-%{release} This package contains the platform neutral backends used in the Guidance configuration tools. +%files backends +%defattr(-,root,root,-) +%{python_sitearch}/%{name}/MicroHAL.py* +%{python_sitearch}/%{name}/ScanPCI.py* +%{python_sitearch}/%{name}/infimport.py* +%{python_sitearch}/%{name}/displayconfigabstraction.py* +%{python_sitearch}/%{name}/displayconfig-hwprobe.py* +%{python_sitearch}/%{name}/displayconfig-restore.py* +%{python_sitearch}/%{name}/drivedetect.py* +%{python_sitearch}/%{name}/execwithcapture.py* +%{python_sitearch}/%{name}/wineread.py* +%{python_sitearch}/%{name}/winewrite.py* +%{python_sitearch}/%{name}/xf86misc.py* +%{python_sitearch}/%{name}/xorgconfig.py* +%{python_sitearch}/ixf86misc.so +%{tde_datadir}/apps/guidance/vesamodes +%{tde_datadir}/apps/guidance/extramodes +%{tde_datadir}/apps/guidance/widescreenmodes +%{tde_datadir}/apps/guidance/Cards+ +%{tde_datadir}/apps/guidance/pcitable +%{tde_datadir}/apps/guidance/MonitorsDB + +########## + +%if 0%{?with_powermanager} %package powermanager -Group: Applications/Utilities -Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} +Group: Applications/Utilities +Summary: HAL based power manager applet [Trinity] +Requires: %{name} = %{version}-%{release} +Requires: hal Obsoletes: trinity-guidance-powermanager < %{version}-%{release} Provides: trinity-guidance-powermanager = %{version}-%{release} +%if "%{tde_prefix}" == "/usr" +Conflicts: guidance-power-manager +Conflicts: kde-guidance-powermanager +%endif + %description powermanager A power management applet to indicate battery levels and perform hibernate or suspend using HAL. +%files powermanager +%defattr(-,root,root,-) +%{tde_bindir}/guidance-power-manager +%{python_sitearch}/%{name}/MicroHAL.py* +%{python_sitearch}/%{name}/guidance-power-manager.py* +%{python_sitearch}/%{name}/powermanage.py* +%{python_sitearch}/%{name}/gpmhelper.py* +%{python_sitearch}/%{name}/powermanager_ui.py* +%{python_sitearch}/%{name}/guidance_power_manager_ui.py* +%{python_sitearch}/%{name}/notify.py* +%{python_sitearch}/%{name}/tooltip.py* +%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%{tde_datadir}/apps/guidance/pics/ac-adapter.png +%{tde_datadir}/apps/guidance/pics/battery*.png +%{tde_datadir}/apps/guidance/pics/processor.png +%{tde_datadir}/autostart/guidance-power-manager.desktop + +%post powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + +%postun powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + +%endif + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep -%setup -q -n trinity-tde-guidance-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .mountconfig +%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} +%__sed -i "userconfig/unixauthdb.py" \ + -e "s|self.first_uid = .*|self.first_uid = 500|" \ + -e "s|self.first_gid = .*|self.first_gid = 500|" +%endif + + %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR=%{tde_prefix} # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia export PYTHONDONTWRITEBYTECODE= -# Ugly hack for building Guidance in a non-standard python directory -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" - # FTBFS on PCLOS ... export CXXFLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" @@ -184,7 +303,6 @@ fi %install unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" # For RHEL4 only @@ -220,7 +338,7 @@ done %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png # fix binary-or-shlib-defines-rpath -chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so +chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so # fix executable-not-elf-or-script %__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png @@ -245,7 +363,7 @@ chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py -%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop +%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop ##### BACKENDS INSTALLATION # install displayconfig-hwprobe.py script @@ -261,7 +379,7 @@ chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so %__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB %endif - +%if 0%{?with_powermanager} ##### POWERMANAGER INSTALLATION # install icon to right place %__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ @@ -290,6 +408,15 @@ chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py +%else + +%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py* +%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py* +%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* +%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* +%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* + +%endif # Replace all '#!' calls to python with /usr/bin/python # and make them executable @@ -320,114 +447,10 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; %__rm -rf %{buildroot} -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%post powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -#%{tde_bindir}/displayconfig -#%{tde_bindir}/displayconfig-restore -%{tde_bindir}/grubconfig -%{tde_bindir}/mountconfig -%{tde_bindir}/serviceconfig -%{tde_bindir}/userconfig -%{tde_bindir}/wineconfig -%attr(0644,root,root) %{tde_tdelibdir}/*.so -%attr(0644,root,root) %{tde_tdelibdir}/*.la -%{tde_datadir}/apps/guidance/ -%{tde_datadir}/applications/kde/*.desktop -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/grubconfig.py* -%{python_sitearch}/%{name}/ktimerdialog.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/servertestdialog.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* -%{python_sitearch}/%{name}/wineconfig.py* -%{tde_tdedocdir}/HTML/en/guidance/ - -# Files from backends -%exclude %{tde_datadir}/apps/guidance/vesamodes -%exclude %{tde_datadir}/apps/guidance/extramodes -%exclude %{tde_datadir}/apps/guidance/widescreenmodes -%exclude %{tde_datadir}/apps/guidance/Cards+ -%exclude %{tde_datadir}/apps/guidance/pcitable -%exclude %{tde_datadir}/apps/guidance/MonitorsDB - -# Files from powermanager -%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png -%exclude %{tde_datadir}/apps/guidance/pics/battery*.png -%exclude %{tde_datadir}/apps/guidance/pics/processor.png - -%files backends -%defattr(-,root,root,-) -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/ScanPCI.py* -%{python_sitearch}/%{name}/infimport.py* -%{python_sitearch}/%{name}/displayconfigabstraction.py* -%{python_sitearch}/%{name}/displayconfig-hwprobe.py* -%{python_sitearch}/%{name}/displayconfig-restore.py* -%{python_sitearch}/%{name}/drivedetect.py* -%{python_sitearch}/%{name}/execwithcapture.py* -%{python_sitearch}/%{name}/wineread.py* -%{python_sitearch}/%{name}/winewrite.py* -%{python_sitearch}/%{name}/xf86misc.py* -%{python_sitearch}/%{name}/xorgconfig.py* -%{python_sitearch}/ixf86misc.so -%{tde_datadir}/apps/guidance/vesamodes -%{tde_datadir}/apps/guidance/extramodes -%{tde_datadir}/apps/guidance/widescreenmodes -%{tde_datadir}/apps/guidance/Cards+ -%{tde_datadir}/apps/guidance/pcitable -%{tde_datadir}/apps/guidance/MonitorsDB - - - -%files powermanager -%defattr(-,root,root,-) -%{tde_bindir}/guidance-power-manager -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%{tde_datadir}/apps/guidance/pics/ac-adapter.png -%{tde_datadir}/apps/guidance/pics/battery*.png -%{tde_datadir}/apps/guidance/pics/processor.png -%{tde_datadir}/autostart/guidance-power-manager.desktop - - - %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-9 +- Build for Fedora 19 + * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-6 - Work around mountconfig incorrectly handling LABEL tag diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec index ffef5b227..3661eebfb 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tde-style-lipstik +%define tde_pkg tde-style-lipstik +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,33 +24,33 @@ %define _docdir %{tde_docdir} -Name: trinity-tde-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: 4%{?dist}%{?_variant} +Name: trinity-tde-style-lipstik +Summary: Lipstik style for TDE +Version: 2.2.3 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: trinity-%{tdecomp}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Obsoletes: trinity-kde-style-lipstik < %{version}-%{release} Provides: trinity-kde-style-lipstik = %{version}-%{release} Obsoletes: trinity-style-lipstik < %{version}-%{release} Provides: trinity-style-lipstik = %{version}-%{release} -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 %description @@ -65,13 +66,7 @@ Lipstik also provides Lipstik-color-schemes %prep -%setup -q -n trinity-%{tdecomp}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -81,7 +76,6 @@ Lipstik also provides Lipstik-color-schemes %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -89,8 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -120,6 +119,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec index 6915852be..7facfdf39 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp tde-style-qtcurve -%define tdeversion 3.5.13.2 +%define tde_pkg tde-style-qtcurve +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -24,27 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-tde-style-qtcurve -Summary: This is a set of widget styles for Trinity based apps -Version: 0.55.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-tde-style-qtcurve +Summary: This is a set of widget styles for Trinity based apps +Version: 0.55.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release} @@ -66,21 +68,13 @@ gtk2-engines-qtcurve. %prep -%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}} - +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export KDEDIR="%{tde_prefix}" export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" @@ -103,11 +97,18 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ -DQTC_QT_ONLY=false \ -DQTC_STYLE_SUPPORT=true \ @@ -143,6 +144,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec index bf6bddbd6..cf9b3a815 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec @@ -1,5 +1,6 @@ # Default version for this component -%define tdecomp tde-systemsettings +%define tde_pkg tde-systemsettings +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -8,7 +9,7 @@ %define tde_sysconfdir %{tde_prefix}/etc %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -25,22 +26,22 @@ %define _docdir %{tde_docdir} -Name: trinity-tde-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: 7%{?dist}%{?_variant} +Name: trinity-tde-systemsettings +Summary: easy to use control centre for TDE +Version: 0.0svn20070312 +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: trinity-%{tdecomp}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kde-settings-laptops.directory Provides: trinity-kde-systemsettings = %{version}-%{release} @@ -48,12 +49,13 @@ Obsoletes: trinity-kde-systemsettings < %{version}-%{release} Provides: trinity-systemsettings = %{version}-%{release} Obsoletes: trinity-systemsettings < %{version}-%{release} -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 -Requires: trinity-guidance +Requires: trinity-guidance %description System preferences is a replacement for the TDE @@ -66,13 +68,7 @@ Control Centre with an improved user interface. %prep -%setup -q -n trinity-%{tdecomp}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -82,7 +78,6 @@ Control Centre with an improved user interface. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR="%{tde_prefix}" %configure \ @@ -92,9 +87,13 @@ export KDEDIR="%{tde_prefix}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --sysconfdir=%{tde_sysconfdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -118,12 +117,12 @@ export PATH="%{tde_bindir}:${PATH}" %post touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update +update-desktop-database %{tde_tdeappdir} -q &> /dev/null %postun touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update +update-desktop-database %{tde_tdeappdir} -q &> /dev/null %files %defattr(-,root,root,-) @@ -145,6 +144,9 @@ xdg-user-dirs-update %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8 +- Build for Fedora 19 + * Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7 - Rebuild diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec index 76f4af5d7..79429ac17 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdeio-apt +%define tde_pkg tdeio-apt +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,26 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: An apt-cache ioslave for Trinity -Version: 0.13.2 -Release: 1%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: An apt-cache ioslave for Trinity +Version: 0.13.2 +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://lpnotfr.free.fr/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +Patch1: tdeio-apt-14.0.0-ftbfs.patch + +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 @@ -62,13 +66,8 @@ browsing the packages easier. It provides: %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -78,7 +77,6 @@ browsing the packages easier. It provides: %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -88,9 +86,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -122,6 +124,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec index fe83d5815..d413e41f1 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdeio-locate +%define tde_pkg tdeio-locate +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,26 +24,27 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: kio-slave for the locate command [Trinity] +Version: 0.4.5 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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: cmake >= 2.8 @@ -51,7 +53,7 @@ Obsoletes: trinity-kio-locate < %{version}-%{release} Provides: trinity-kio-locate = %{version}-%{release} %description -Adds support for the "locate:" and "locater:" +Adds support for the "locate" and "locater:" protocols to Konqueror and other TDE applications. This enables you to perform locate searches as you @@ -65,42 +67,33 @@ as a directory. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside SCONS files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/kde.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build cd build %endif - %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ -DBUILD_ALL=ON \ .. @@ -132,6 +125,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/searchproviders/locate.desktop %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec index 358ca9f70..8697ce046 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdeio-umountwrapper +%define tde_pkg tdeio-umountwrapper +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,35 +24,36 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: progress dialog for safely removing devices in Trinity. +Version: 0.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://frode.kde.no/misc/kio_umountwrapper/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://frode.kde.no/misc/tdeio_umountwrapper/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz -Source1: media_safelyremove.desktop +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: media_safelyremove.desktop_tdeio -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} Provides: trinity-kio-umountwrapper = %{version}-%{release} %description -Wrapper around kio_media_mountwrapper. +Wrapper around tdeio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. @@ -62,13 +64,7 @@ Provides a progress dialog for Safely Removing of devices in Trinity. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -78,7 +74,6 @@ Provides a progress dialog for Safely Removing of devices in Trinity. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -88,9 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -101,7 +100,6 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} %__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper %__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper @@ -117,7 +115,6 @@ for f in konqueror d3lphin; do 20 done - %postun if [ $1 -eq 0 ]; then for f in konqueror d3lphin; do @@ -132,10 +129,12 @@ fi %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/kio_umountwrapper %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.5-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec index ae58cf081..0e30e1b7a 100644 --- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec +++ b/redhat/applications/tderadio/tderadio-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp tderadio -%define tdeversion 3.5.13.2 +%define tde_pkg tderadio +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,30 +27,30 @@ %define with_lirc 1 %endif -Name: trinity-%{tdecomp} -Summary: Comfortable Radio Application for KDE [Trinity] -Version: 0.1.1.1 -Release: 6%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Comfortable Radio Application for TDE [Trinity] +Version: 0.1.1.1 +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 +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 +BuildRequires: gettext BuildRequires: libsndfile-devel %{?with_lirc:BuildRequires: lirc-devel} @@ -96,13 +96,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. %prep -%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -113,7 +107,6 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -123,8 +116,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath \ + \ %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ --enable-v4l2 \ --enable-lame \ @@ -175,6 +174,9 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||: %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-7 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-6 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec index 6cfd9e75c..fdea492db 100644 --- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec +++ b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdesudo +%define tde_pkg tdesudo +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,34 +24,34 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: sudo frontend for Trinity +Name: trinity-%{tde_pkg} +Summary: sudo frontend for Trinity -Version: 2.5.1 -Release: 4%{?dist}%{?_variant} +Version: 2.5.1 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kdesudo < %{version}-%{release} Provides: trinity-kdesudo = %{version}-%{release} -Requires: sudo +Requires: sudo %description TdeSudo is a graphical frontend for the sudo utility. @@ -63,13 +64,7 @@ It allows you to run programs as another user by entering your password. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -79,15 +74,21 @@ It allows you to run programs as another user by entering your password. %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_docdir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -97,28 +98,9 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - %find_lang kdesudo + %clean %__rm -rf %{buildroot} @@ -131,6 +113,9 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index b98cb94b4..e2e9f0ebf 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: subversion client with tight TDE integration [Trinity] Version: 1.0.4 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -42,10 +42,10 @@ 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 BuildRequires: subversion-devel Requires: %{name}-tdeio-plugins = %{version}-%{release} @@ -111,18 +111,6 @@ This package is part of tdesvn-trinity. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -find . -name CMakeLists.txt -exec %__sed -i {} \ - -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ - -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ - -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ - \; - -# More ugly hack to add TQT include directory in CMakeLists.txt -%__sed -i CMakeLists.txt \ - -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt," - # Moves HTML files to the correect location find . -name "*.cmake" -exec %__sed -i {} \ -e "s,/doc/HTML,/doc/tde/HTML,g" \ @@ -132,8 +120,6 @@ find . -name "*.cmake" -exec %__sed -i {} \ %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} @@ -142,10 +128,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ @@ -156,6 +143,9 @@ cd build -DDATA_INSTALL_DIR=%{tde_datadir} \ -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ .. # SMP safe ! @@ -180,7 +170,7 @@ export PATH="%{_bindir}:${PATH}" %__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol -%find_lang %{tde_pkg} +%find_lang kdesvn %clean @@ -277,6 +267,9 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-7 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6 - Rebuild with NDEBUG option diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec index c653973f1..8df2bce99 100644 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdmtheme +%define tde_pkg tdmtheme +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,31 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: theme manager for TDM [Trinity] -Version: 1.2.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: theme manager for TDM [Trinity] +Version: 1.2.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://beta.smileaf.org/projects -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# [tdmtheme] Fix tdmtheme crash. This resolves Bug 1544 -Patch1: tdmtheme-3.5.13.2-fix_segv.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 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kdmtheme < %{version}-%{release} @@ -66,14 +65,7 @@ that allows you to easily install, remove and change your KDM themes. %prep -%setup -q -n %{name}-3.5.13.2 -%patch1 -p1 -b .segv - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -83,7 +75,6 @@ that allows you to easily install, remove and change your KDM themes. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -93,8 +84,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -126,6 +122,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-6 +- Build for Fedora 19 + * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5 - Fix tdmtheme crash. This resolves Bug 1544 diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec index 59b542bdc..20549a7e5 100644 --- a/redhat/applications/tellico/tellico-3.5.13.2.spec +++ b/redhat/applications/tellico/tellico-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: Icollection manager for books, videos, music [Trinity] Version: 1.3.2.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -45,9 +45,11 @@ Patch1: tellico-3.5.13.2-videodev.patch Patch2: tellico-3.5.13.2-ftbfs.patch 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 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -138,12 +140,6 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then fi %patch2 -p1 -b .ftbfs -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -166,12 +162,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" \ --disable-dependency-tracking \ --disable-debug \ - --enable-new-ldflags \ --disable-final \ + --enable-new-ldflags \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath \ \ --enable-webcam @@ -187,9 +181,6 @@ export PATH="%{tde_bindir}:${PATH}" %__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg %__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg -# Remove dead symlink from French translation -%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common - %find_lang %{tde_pkg} @@ -244,6 +235,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-7 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6 - Rebuild with NDEBUG option diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec index d110e6813..79136634a 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp twin-style-crystal +%define tde_pkg twin-style-crystal +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: Semi transparant window decoration for Trinity. -Version: 1.0.5 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Semi transparant window decoration for Trinity. +Version: 1.0.5 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kwin-style-crystal < %{version}-%{release} @@ -65,13 +68,7 @@ And it is of course nice to look at. Upstream says: %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -81,7 +78,6 @@ And it is of course nice to look at. Upstream says: %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -91,8 +87,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -119,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec index 5d103eb87..e93214a0a 100644 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp wlassistant +%define tde_pkg wlassistant +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,27 +24,29 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: User friendly KDE frontend for wireless network connection [Trinity] -Version: 0.5.7 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: User friendly TDE frontend for wireless network connection [Trinity] +Version: 0.5.7 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://wlassistant.sourceforge.net/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://wlassistant.sourceforge.net/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 BuildRequires: python @@ -63,14 +66,13 @@ remembered so next time the user won't have to enter them again. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then @@ -85,10 +87,18 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ -DBUILD_ALL=on \ .. @@ -133,6 +143,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-3 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec index eba5001ac..bd9b54200 100644 --- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec +++ b/redhat/applications/yakuake/yakuake-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp yakuake -%define tdeversion 3.5.13.2 +%define tde_pkg yakuake +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -24,30 +24,32 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. -Version: 2.8.1 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. +Version: 2.8.1 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 + %description -Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. +Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package @@ -55,13 +57,7 @@ Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. %prep -%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -71,7 +67,6 @@ Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -81,9 +76,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -118,6 +117,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config.kcfg/*.kcfg %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-6 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/buildall.sh b/redhat/buildall-r14.sh index 1fce6fd63..1fce6fd63 100755 --- a/redhat/buildall.sh +++ b/redhat/buildall-r14.sh diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec index 37db1d0b6..d955876cc 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -15,8 +15,9 @@ %define _docdir %{tde_datadir}/doc Name: trinity-arts -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Epoch: 1 +Version: 1.5.10 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons @@ -28,7 +29,7 @@ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kcmartsrc-pulseaudio BuildRequires: cmake >= 2.8 @@ -89,10 +90,7 @@ BuildRequires: libmad-devel %define with_pulseaudio 1 %endif -# TDE 3.5.13 specific building variables -BuildRequires: cmake >= 2.8 - -Requires: trinity-tqtinterface >= %{version} +Requires: trinity-tqtinterface >= %{tde_version} Requires: audiofile %if "%{?tde_prefix}" == "/usr" @@ -141,7 +139,7 @@ playing a wave file with some effects. %package devel Group: Development/Libraries Summary: %{name} - Development files -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?tde_prefix}" == "/usr" Obsoletes: arts-devel %endif @@ -174,7 +172,7 @@ Development files for %{name} %package config-pulseaudio Group: System Environment/Daemons Summary: %{name} - Default configuration file for Pulseaudio -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description config-pulseaudio %{summary} @@ -195,7 +193,7 @@ Requires: %{name} = %{version}-%{release} %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build @@ -208,11 +206,12 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" cd build %endif -%cmake .. \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ @@ -226,7 +225,8 @@ cd build -DWITH_VORBIS=ON \ %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ %{?with_esound:-DWITH_ESOUND=ON} \ - %{?with_jack:-DWITH_JACK=ON} + %{?with_jack:-DWITH_JACK=ON} \ + .. %__make %{?_smp_mflags} || %__make @@ -246,6 +246,9 @@ cd build %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec index 0cf7032cc..cd59347e4 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec @@ -1,18 +1,13 @@ -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin +# TDE specific building variables +%define tde_version 3.5.13.2 +%define tde_prefix /usr %define tde_includedir %{tde_prefix}/include -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc %define tde_libdir %{tde_prefix}/%{_lib} Name: trinity-avahi-tqt -Version: 3.5.13.2 +Epoch: 1 +Version: 0.6.30 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Avahi TQT Interface @@ -25,43 +20,42 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel -BuildRequires: tqtinterface-devel >= 3.5.13.1 +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: gettext-devel BuildRequires: libtool %if 0%{?suse_version} BuildRequires: dbus-1-devel -%else +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: dbus-devel %endif +# AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}avahi-client-devel -%if 0%{?pclinuxos} -BuildRequires: libexpat-devel -%else -# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel' -BuildRequires: %{_lib}expat%{?mgaversion:1}-devel -%endif Provides: %{_lib}avahi-qt3 -%else +%endif +%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} BuildRequires: avahi-devel -%if 0%{?suse_version} -BuildRequires: libexpat-devel -%else +%endif + +# EXPAT support +%if 0%{?rhel} || 0%{?fedora} BuildRequires: expat-devel %endif +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libexpat-devel %endif -Requires: qt3 -Requires: trinity-tqtinterface >= 3.5.13 +Requires: qt3 >= 3.3.8d +Requires: trinity-tqtinterface >= %{tde_version} -Obsoletes: avahi-tqt < %{version}-%{release} -Provides: avahi-tqt = %{version}-%{release} +Obsoletes: avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -69,16 +63,16 @@ Avahi TQT Interface %package devel -Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?mgaversion} || 0%{?mdkversion} Provides: %{_lib}avahi-qt3-devel %endif -Obsoletes: avahi-tqt-devel < %{version}-%{release} -Provides: avahi-tqt-devel = %{version}-%{release} +Obsoletes: avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development files for %{name} @@ -90,45 +84,32 @@ Development files for %{name} %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "acinclude.m4" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - -%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +./autogen.sh -# Removes stale libtool stuff -%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4 %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt" -export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" - -./autogen.sh %configure \ --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_docdir} \ --includedir=%{tde_includedir} \ --libdir=%{tde_libdir} \ + \ + --disable-static \ + --disable-dependency-tracking \ + \ --enable-compat-libdns_sd \ - --with-systemdsystemunitdir=/lib/systemd/system \ - MOC_QT3=%{tde_bindir}/moc-tqt + --with-systemdsystemunitdir=/lib/systemd/system %__make %{?_smp_mflags} + %install %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} -# Removes '.a' file -%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a %clean %__rm -rf %{?buildroot} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec index 36f1e0a58..58f738326 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec @@ -1,21 +1,20 @@ -# 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 +%define tde_version 3.5.13.2 +%define tde_prefix /usr %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} Name: trinity-dbus-1-tqt -Version: 3.5.13.2 +Epoch: 1 +Version: 0.9 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface Group: System Environment/Libraries -Obsoletes: dbus-1-tqt < %{version}-%{release} -Provides: dbus-1-tqt = %{version}-%{release} +Obsoletes: dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -23,7 +22,7 @@ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: gcc-c++ %if 0%{?suse_version} @@ -31,36 +30,63 @@ BuildRequires: dbus-1-devel %else BuildRequires: dbus-devel %endif -BuildRequires: trinity-tqtinterface-devel >= %{version} -# TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel -Requires: qt3 +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +Requires: qt3 >= 3.3.8d %description Dbus TQT Interface +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_bindir}/dbusxml2qt3 +%{tde_libdir}/libdbus-1-tqt.so.0 +%{tde_libdir}/libdbus-1-tqt.so.0.0.0 + +########## %package devel Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries -Obsoletes: dbus-1-tqt-devel < %{version}-%{release} -Provides: dbus-1-tqt-devel = %{version}-%{release} +Obsoletes: dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development files for %{name} +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/*.h +%{tde_libdir}/libdbus-1-tqt.so +%{tde_libdir}/libdbus-1-tqt.la +%{tde_libdir}/pkgconfig/*.pc + +########## + %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build @@ -73,6 +99,12 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ @@ -85,34 +117,14 @@ cd build %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} -C build + %clean %__rm -rf %{?buildroot} -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -%files -%defattr(-,root,root,-) -%{tde_bindir}/dbusxml2qt3 -%{tde_libdir}/libdbus-1-tqt.so.0 -%{tde_libdir}/libdbus-1-tqt.so.0.0.0 - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/*.h -%{tde_libdir}/libdbus-1-tqt.so -%{tde_libdir}/libdbus-1-tqt.la -%{tde_libdir}/pkgconfig/*.pc %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec index a4a4488a9..68dac0e31 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec @@ -1,13 +1,12 @@ -# 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 +%define tde_version 3.5.13.2 +%define tde_prefix /usr %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} Name: trinity-dbus-tqt -Version: 3.5.13.2 +Epoch: 1 +Version: 0.63 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface @@ -19,7 +18,7 @@ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [dbus-tqt] Fix build on RHEL 4 Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch @@ -32,31 +31,55 @@ BuildRequires: dbus-devel %endif BuildRequires: trinity-tqtinterface-devel >= %{version} -# TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel +BuildRequires: qt3-devel >= 3.3.8d +Requires: qt3 >= 3.3.8d -Requires: qt3 - -Obsoletes: dbus-tqt < %{version}-%{release} -Provides: dbus-tqt = %{version}-%{release} +Obsoletes: dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release} %description Dbus TQT Interface +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_libdir}/libdbus-tqt-1.so.0 +%{tde_libdir}/libdbus-tqt-1.so.0.0.0 + +########## %package devel Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries -Obsoletes: dbus-tqt-devel < %{version}-%{release} -Provides: dbus-tqt-devel = %{version}-%{release} +Obsoletes: dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development files for %{name} +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/dbus-1.0/* +%{tde_libdir}/libdbus-tqt-1.so +%{tde_libdir}/libdbus-tqt-1.la +%{tde_libdir}/pkgconfig/dbus-tqt.pc + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package @@ -64,7 +87,7 @@ Development files for %{name} %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %if 0%{?rhel} == 4 %patch1 -p1 -b .dbustypes @@ -85,6 +108,12 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ .. @@ -96,33 +125,14 @@ cd build %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} -C build + %clean %__rm -rf %{?buildroot} -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -%files -%defattr(-,root,root,-) -%{tde_libdir}/libdbus-tqt-1.so.0 -%{tde_libdir}/libdbus-tqt-1.so.0.0.0 - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/dbus-1.0/* -%{tde_libdir}/libdbus-tqt-1.so -%{tde_libdir}/libdbus-tqt-1.la -%{tde_libdir}/pkgconfig/dbus-tqt.pc %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec index f792bb98d..9bd814c2a 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 3.5.13.2 + %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -10,7 +12,7 @@ Name: trinity-libcaldav Version: 0.6.5 -Release: 3%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -60,6 +62,7 @@ easy to integrate CalDAV support into any PIM application. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} + Obsoletes: libcaldav-devel < %{version}-%{release} Provides: libcaldav-devel = %{version}-%{release} @@ -74,44 +77,50 @@ Provides: libcaldav-devel = %{version}-%{release} %prep %setup -q -n libcaldav-%{version} %patch1 -p1 -b .dir +autoreconf --force --install --symlink + %build # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}" +export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" 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 \ --docdir=%{tde_docdir}/libcaldav \ --includedir=%{tde_includedir} \ --libdir=%{tde_libdir} \ - + \ + --disable-dependency-tracking + %__make %{?_smp_mflags} + %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Unwanted files %__rm -f %{buildroot}%{tde_libdir}/*.a + %clean %__rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{tde_libdir}/*.so.* +%{tde_libdir}/libcaldav.so.* %{tde_docdir}/libcaldav/ %files devel %defattr(-,root,root,-) %{tde_includedir}/caldav.h -%{tde_libdir}/*.la -%{tde_libdir}/*.so +%{tde_libdir}/libcaldav.la +%{tde_libdir}/libcaldav.so %{tde_libdir}/pkgconfig/libcaldav.pc %post @@ -128,7 +137,10 @@ autoreconf --force --install --symlink %Changelog -* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4 +- Build for Fedora 19 + +* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 - Renames to 'trinity-libcaldav' - Build on MGA2 diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec new file mode 100644 index 000000000..532354e33 --- /dev/null +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -0,0 +1,146 @@ +# 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 3.5.13.2 + +%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: libcarddav_0.6.2-2debian2.tar.gz + +# [libcarddav] Fix messy installation directories +Patch1: libcarddav-0.6.5-fix_installation.patch + +# CURL support +%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 libcarddav-%{version} +%patch1 -p1 -b .dir +autoreconf --force --install --symlink + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh + +# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 +export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +# RHEL4 stuff +if [ -d /usr/evolution28 ]; then + export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +fi + +%configure \ + --includedir=%{tde_includedir} \ + --libdir=%{tde_libdir} \ + \ + --disable-dependency-tracking + +%__make %{?_smp_mflags} + + +%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}/carddav.h +%{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 +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4 +- Build for Fedora 19 + +* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3 +- Renames to 'trinity-libcaldav' +- Build on MGA2 + +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1 +- Initial release for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec index 9b07e7087..c186c9c70 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 3.5.13.2 + %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} @@ -12,21 +14,21 @@ %define _docdir %{tde_datadir}/doc -Name: trinity-tqca-tls -Version: 1.0 -Release: 2%{?dist}%{?_variant} +Name: trinity-tqca-tls +Version: 1.0 +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} -Summary: TLS plugin for the TQt Cryptographic Architecture -License: LGPLv2+ -Group: Applications/Internet +Summary: TLS plugin for the TQt Cryptographic Architecture +License: LGPLv2+ +Group: Applications/Internet -URL: http://delta.affinix.com/qca/ -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://delta.affinix.com/qca/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: tqca-tls-master.tar.gz +Source0: tqca-tls-master.tar.gz # Fix build in mach for QT apps Patch0: qca-tls-1.0-mach.patch @@ -35,8 +37,8 @@ Patch2: qca-tls-1.0-ossl10.patch # Allows building with TQT3 from TDE Patch10: tqca-tls-qt3.patch -BuildRequires: qt3-devel >= 3.3.8.d -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 +BuildRequires: qt3-devel >= 3.3.8.d +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqca-devel >= 1.0 BuildRequires: openssl-devel >= 0.9.8 @@ -99,6 +101,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 +- Build for Fedora 19 + * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 - Renames TQCA to QCA in source code diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index 423c9104d..ac4b88cca 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 3.5.13.2 + %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} @@ -15,7 +17,7 @@ Name: trinity-tqca Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} Summary: TQt Cryptographic Architecture @@ -31,11 +33,12 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: tqca-master.tar.gz + Patch0: qca-1.0-mach.patch Patch1: tqca-1.0-fix_qt3_detection.patch BuildRequires: qt3-devel >= 3.3.8.d -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} %description Taking a hint from the similarly-named Java Cryptography Architecture, @@ -124,6 +127,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 +- Build for Fedora 19 + * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 - Renames TQCA to QCA in source code diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index 8ace60ef9..a153b133b 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -1,20 +1,14 @@ -# 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 -%define cmake_modules_dir %{tde_prefix}/share/cmake -%else -%define cmake_modules_dir %{_datadir}/cmake/Modules -%endif - -# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. -# Later compiled Trinity products should be aware of that ! +# TDE specific building variables +%define tde_version 3.5.13.2 +%define tde_prefix /usr %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define cmake_modules_dir %{_datadir}/cmake/Modules Name: trinity-tqtinterface -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface Group: System Environment/Libraries @@ -27,7 +21,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -# TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 BuildRequires: qt3-devel >= 3.3.8d Requires: qt3 >= 3.3.8d @@ -60,11 +53,39 @@ Provides: tqtinterface = %{version}-%{release} %description Trinity QT Interface + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_bindir}/convert_qt_tqt1 +%{tde_bindir}/convert_qt_tqt2 +%{tde_bindir}/convert_qt_tqt3 +%{tde_bindir}/dcopidl-tqt +%{tde_bindir}/dcopidl2cpp-tqt +%{tde_bindir}/dcopidlng-tqt +%{tde_bindir}/mcopidl-tqt +%{tde_bindir}/moc-tqt +%{tde_bindir}/tmoc +%{tde_bindir}/tqt-replace +%{tde_bindir}/tqt-replace-stream +%{tde_bindir}/uic-tqt +%{tde_libdir}/libtqassistantclient.so.4 +%{tde_libdir}/libtqassistantclient.so.4.2.0 +%{tde_libdir}/libtqt.so.4 +%{tde_libdir}/libtqt.so.4.2.0 + +########## + %package devel Group: Development/Libraries Summary: %{name} - Development files Requires: %{name} = %{version}-%{release} -Requires: qt3-devel +Requires: qt3-devel >= 3.3.8d Obsoletes: tqtinterface-devel < %{version}-%{release} Provides: tqtinterface-devel = %{version}-%{release} @@ -72,6 +93,24 @@ Provides: tqtinterface-devel = %{version}-%{release} %description devel Development files for %{name} +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/tqt/ +%{tde_libdir}/libtqassistantclient.la +%{tde_libdir}/libtqassistantclient.so +%{tde_libdir}/libtqt.la +%{tde_libdir}/libtqt.so +%{tde_libdir}/pkgconfig/tqt.pc +%{cmake_modules_dir}/*.cmake + +########## + %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -92,14 +131,25 @@ cd build # another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...) # Otherwise, it defaults to ${QTDIR}/lib ! %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DQT_PREFIX_DIR=${QTDIR} \ -DQT_VERSION=3 \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \ -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \ + \ + -DWITH_QT3="ON" \ + -DBUILD_ALL="ON" \ + -DUSE_QT3="ON" \ .. %__make %{?_smp_mflags} @@ -107,7 +157,6 @@ cd build %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot}%{_includedir} %__make install DESTDIR=%{?buildroot} -C build # RHEL 5: add newline at end of include files to avoid warnings @@ -123,35 +172,14 @@ for i in cmake/modules/*.cmake; do %__install -m 644 $i %{?buildroot}%{cmake_modules_dir} done + %clean %__rm -rf %{?buildroot} -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -%files -%defattr(-,root,root,-) -%{tde_bindir}/* -%{tde_libdir}/*.so.* - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/tqt -%{tde_libdir}/*.so -%{tde_libdir}/*.la -%{tde_libdir}/pkgconfig/*.pc -%{cmake_modules_dir}/*.cmake - %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/extras/akode/akode-3.5.13.2.spec b/redhat/extras/akode/akode-3.5.13.2.spec index 39239c86c..5a823728c 100644 --- a/redhat/extras/akode/akode-3.5.13.2.spec +++ b/redhat/extras/akode/akode-3.5.13.2.spec @@ -18,15 +18,16 @@ %define _docdir %{tde_docdir} -Summary: Audio-decoding framework -Name: trinity-akode -Version: 2.0.2 -Release: 4%{?dist}%{?_variant} - -License: LGPLv2+ -Group: System Environment/Libraries -#URL: http://carewolf.com/akode/ -URL: http://www.kde-apps.org/content/show.php?content=30375 +Summary: Audio-decoding framework +Name: trinity-akode +Version: 2.0.2 +Release: 5%{?dist}%{?_variant} + +License: LGPLv2+ +Group: System Environment/Libraries +#URL: http://carewolf.com/akode/ +URL: http://www.kde-apps.org/content/show.php?content=30375 + Source0: akode-2.0.2.tar.bz2 Prefix: %{tde_prefix} @@ -39,11 +40,10 @@ Patch2: akode-2.0.2-multilib.patch Patch3: akode-2.0.2-flac113-portable.patch Patch4: akode-2.0.2-gcc43.patch -# New patch for Fedora 16 / TDE 3.5.13 +# New patches Patch10: akode-autotools.patch Patch11: akode-2.0.2-fix_ffmpeg_include.patch - # FLAC support %define _with_flac --with-flac %if 0%{?mgaversion} || 0%{?mdkversion} @@ -117,6 +117,8 @@ aKode currently has the following decoder plugins: aKode also has the following audio outputs: * alsa: Outputs to ALSA (dmix is recommended). +* jack +* pulseaudio %files %defattr(-,root,root,-) @@ -144,7 +146,12 @@ aKode also has the following audio outputs: Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}} +%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}} +%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}} +%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}} Requires: pkgconfig + %description devel %{summary}. @@ -284,12 +291,6 @@ Requires: %{name} = %{version}-%{release} %patch10 -p1 -b .autotools %patch11 -p1 -b .ffmpeg -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common cvs @@ -300,9 +301,14 @@ Requires: %{name} = %{version}-%{release} --libdir=%{tde_libdir} \ --includedir=%{tde_includedir} \ --datadir=%{tde_datadir} \ - --disable-static \ - --enable-shared \ - --disable-debug --disable-warnings --disable-dependency-tracking \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ --without-libltdl \ --with-alsa \ --with-oss \ @@ -313,10 +319,7 @@ Requires: %{name} = %{version}-%{release} --with-speex \ --with-vorbis \ --without-ffmpeg \ - %{?_with_libmad} %{!?_with_libmad:--without-libmad} \ - --enable-closure \ - --enable-new-ldflags \ - --enable-final + %{?_with_libmad} %{!?_with_libmad:--without-libmad} %__make %{?_smp_mflags} LIBTOOL=$(which libtool) @@ -339,6 +342,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5 +- Build for Fedora 19 + * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec index b41d48879..75864864f 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec @@ -7,7 +7,7 @@ Name: trinity-desktop Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Release: 2%{?dist}%{?_variant} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -114,6 +114,8 @@ Requires: trinity-filelight Requires: trinity-gwenview Requires: trinity-gwenview-i18n Requires: trinity-k3b +Requires: trinity-kaffeine +Requires: trinity-kaffeine-mozilla Requires: trinity-katapult Requires: trinity-kbarcode Requires: trinity-kbfx @@ -198,10 +200,8 @@ Requires: trinity-knetworkmanager # RHEL 4 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -# HAL is too old +# HAL is mandatory for these apps, but too old Requires: trinity-kima -Requires: trinity-kaffeine -Requires: trinity-kaffeine-mozilla Requires: trinity-kmplayer # No OTR support Requires: trinity-kopete-otr @@ -350,6 +350,9 @@ Summary: Default wallpaper for Trinity %endif %changelog +* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Update for RHEL4 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Update to version 3.5.13.2 - Add GPG signing key diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec index d42c6ef8c..56c706a00 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libkdcraw +%define tde_pkg libkdcraw +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +23,12 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Raw picture decoding C++ library (runtime) [Trinity] -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.9 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,11 +40,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils %if 0%{?suse_version} BuildRequires: liblcms-devel @@ -71,7 +73,7 @@ libkdcraw contains the library of libkdcraw. %package devel Group: Development/Libraries Summary: RAW picture decoding C++ library (development) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Libkdcraw is a C++ interface around dcraw binary program used to @@ -86,13 +88,7 @@ library documentation is available on kdcraw.h header file. %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -102,16 +98,20 @@ library documentation is available on kdcraw.h header file. %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -121,7 +121,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{kdecomp} +%find_lang %{tde_pkg} # RHEL4: pkgconfig files do not support 'URL' keyword . %if 0%{?rhel} == 4 @@ -154,7 +154,7 @@ done /sbin/ldconfig || : -%files -f %{kdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_libdir}/libkdcraw.so.4 %{tde_libdir}/libkdcraw.so.4.0.3 @@ -168,5 +168,8 @@ done %{tde_libdir}/pkgconfig/libkdcraw.pc %Changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.1.9-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec index 2aa947dc4..03e4966ac 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libkexiv2 +%define tde_pkg libkexiv2 +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +23,12 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.7 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,11 +40,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -73,7 +75,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %package devel Group: Development/Libraries Summary: Qt like interface for the libexiv2 library (development) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel libkexif2-devel contains development files and documentation for libkexiv2 @@ -87,13 +89,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -106,12 +102,17 @@ export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -157,5 +158,8 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec index 45ede0c38..156064992 100644 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp libkipi - +%define tde_pkg libkipi +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -15,7 +15,6 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -23,11 +22,12 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.5 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -39,11 +39,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils %if 0%{?suse_version} BuildRequires: liblcms-devel @@ -75,7 +75,7 @@ Homepage: http://www.kipi-plugins.org/ %package devel Group: Development/Libraries Summary: library for apps that want to use kipi-plugins (development version) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Libkipi is a library @@ -93,13 +93,7 @@ Homepage: http://www.kipi-plugins.org/ %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -109,16 +103,20 @@ Homepage: http://www.kipi-plugins.org/ %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -128,7 +126,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean @@ -156,7 +154,7 @@ done /sbin/ldconfig || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_libdir}/libkipi.so.0 %{tde_libdir}/libkipi.so.0.1.1 @@ -172,5 +170,8 @@ done %{tde_libdir}/pkgconfig/libkipi.pc %Changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index 86943b89e..2d3f5691e 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libksquirrel +%define tde_pkg libksquirrel +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -15,7 +16,6 @@ %define tde_mandir %{tde_datadir}/man %define tde_appdir %{tde_datadir}/applications -%define tde_tdeappdir %{tde_appdir}/kde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -23,10 +23,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Trinity image viewer -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.8.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,12 +39,12 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch0: libksquirrel-3.5.13-detect_netpbm.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 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -78,6 +79,9 @@ BuildRequires: xmedcon-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif +%if 0%{?fedora} +BuildRequires: librsvg2-tools +%endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: librsvg %endif @@ -128,7 +132,7 @@ Runtime libraries for KSquirrel. %package devel Group: Development/Libraries Summary: Trinity image viewer -Requires: %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development libraries for KSquirrel. @@ -137,7 +141,7 @@ Development libraries for KSquirrel. %package tools Summary: Trinity image viewer Group: Environment/Libraries -Requires: %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description tools Tools for KSquirrel. @@ -149,15 +153,9 @@ Tools for KSquirrel. %prep -%setup -q +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .netpbm -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -176,8 +174,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_includedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ %{?with_djvu:--enable-djvu} %__make %{?_smp_mflags} @@ -199,6 +203,12 @@ export PATH="%{tde_bindir}:${PATH}" %postun /sbin/ldconfig || : +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + %files %defattr(-,root,root,-) @@ -498,5 +508,8 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec index a63006a52..2ba4b2fe6 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec @@ -1,11 +1,13 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +24,10 @@ %define _docdir %{tde_docdir} - Name: trinity-pytdeextensions Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 -Release: 4%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -38,9 +39,7 @@ URL: http://www.simonzone.com/software/pykdeextensions Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz - - +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999] @@ -48,9 +47,9 @@ Patch2: pykdeextensions-3.5.13.2-fix_extra_module_dir.patch # [pykdeextensions] Fix include directory search location Patch5: pykdeextensions-3.5.13.2-fix_include_dir.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 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -73,20 +72,40 @@ Provides: trinity-pykdeextensions = %{version}-%{release} %description -PyKDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. +PyTDE Extensions is a collection of software and Python packages +to support the creation and installation of TDE applications. + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_datadir}/apps/pykdeextensions/ +%{tde_tdedocdir}/HTML/en/pykdeextensions/ +%{python_sitearch}/* +########## %package -n trinity-libpythonize0 Summary: Python packages to support KDE applications (library) [Trinity] Group: Environment/Libraries %description -n trinity-libpythonize0 -PyKDE Extensions is a collection of software and Python packages +PyTDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. This package contains the libpythonize library files. +%post -n trinity-libpythonize0 +/sbin/ldconfig + +%postun -n trinity-libpythonize0 +/sbin/ldconfig + +%files -n trinity-libpythonize0 +%defattr(-,root,root,-) +%{tde_libdir}/libpythonize.so.* + +########## %package -n trinity-libpythonize0-devel Summary: Python packages to support KDE applications (development) [Trinity] @@ -94,19 +113,46 @@ Group: Development/Libraries Requires: trinity-libpythonize0 = %{version}-%{release} %description -n trinity-libpythonize0-devel -PyKDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. +PyTDE Extensions is a collection of software and Python packages +to support the creation and installation of TDE applications. This package contains the libpythonize development files. +%post -n trinity-libpythonize0-devel +/sbin/ldconfig + +%postun -n trinity-libpythonize0-devel +/sbin/ldconfig + +%files -n trinity-libpythonize0-devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_libdir}/libpythonize.la +%{tde_libdir}/libpythonize.so + +########## + +%package devel +Summary: Meta-package to install all pytdeextensions development files +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: trinity-libpythonize0-devel = %{version}-%{release} + +%description devel +%{summary} + +%files devel + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch2 -p1 -b .extramodule %patch5 -p1 -b .incdir @@ -118,13 +164,12 @@ for f in src/*.py; do -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \ -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \ -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \ -e 's|"/kde"|"/tde"|' done # Do not look for 'libpython2.x.so' (from -devel) package. -# Instead look for runtime library. +# Instead look for versioned runtime library. LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)" if [ -f "%{_libdir}/${LIBPYTHON}" ]; then %__sed -i "src/kdedistutils.py" \ @@ -140,9 +185,7 @@ fi %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export KDEDIR="%{tde_prefix}" %__mkdir_p build ./setup.py build_libpythonize @@ -161,7 +204,8 @@ export PYTHONDONTWRITEBYTECODE= --root=%{buildroot} \ --prefix=%{tde_prefix} \ --install-clib=%{tde_libdir} \ - --install-cheaders=%{tde_tdeincludedir} + --install-cheaders=%{tde_tdeincludedir} \ + -v # Removes BUILDROOT directory reference in installed files for f in \ @@ -184,42 +228,15 @@ done # Fix permissions on include files %__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h + %clean %__rm -rf %{buildroot} -%post -n trinity-libpythonize0 -/sbin/ldconfig - -%postun -n trinity-libpythonize0 -/sbin/ldconfig - -%post -n trinity-libpythonize0-devel -/sbin/ldconfig - -%postun -n trinity-libpythonize0-devel -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_datadir}/apps/pykdeextensions -%{tde_tdedocdir}/HTML/en/pykdeextensions -%{python_sitearch}/* - -%files -n trinity-libpythonize0 -%defattr(-,root,root,-) -%{tde_libdir}/libpythonize.so.* - -%files -n trinity-libpythonize0-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libpythonize.la -%{tde_libdir}/libpythonize.so - - %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec index 863d09e58..3237c399f 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec @@ -4,8 +4,9 @@ %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif +%define tde_version 3.5.13.2 -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,50 +28,59 @@ Name: trinity-python-trinity Summary: Trinity bindings for Python [Trinity] Version: 3.16.3 -Release: 4%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/pykdeextensions +#URL: http://www.simonzone.com/software/pykdeextensions +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix include subdirectory 'tde' instead of 'kde' Patch1: python-trinity-3.5.13.2-fix_tde_includedir.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 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +# PYTHON support BuildRequires: python - %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 # RHEL 4/5 comes with old version, so we brought ours ... -BuildRequires: trinity-sip-devel BuildRequires: trinity-PyQt-devel %endif - %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip BuildRequires: python-qt %endif - %if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel BuildRequires: PyQt-devel %endif +%if 0%{?suse_version} +BuildRequires: trinity-PyQt-devel +%endif +# SIP support +%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 +# RHEL 4/5 comes with old version, so we brought ours ... +BuildRequires: trinity-sip-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: sip-devel +%endif %if 0%{?suse_version} BuildRequires: python-sip-devel -BuildRequires: trinity-PyQt-devel %endif Obsoletes: python-trinity < %{version}-%{release} @@ -91,7 +101,7 @@ Obsoletes: python-trinity-devel < %{version}-%{release} Provides: python-trinity-devel = %{version}-%{release} %description devel -Development .sip files with definitions of PyKDE classes. They +Development .sip files with definitions of PyTDE classes. They are needed to build PyTDE, but also as building blocks of other packages based on them. The package also contains kdepyuic, a wrapper script around PyQt's @@ -99,14 +109,14 @@ user interface compiler. %package doc -Summary: Documentation and examples for PyKDE [Trinity] +Summary: Documentation and examples for PyTDE [Trinity] Group: Development/Libraries Obsoletes: python-trinity-doc < %{version}-%{release} Provides: python-trinity-doc = %{version}-%{release} %description doc -General documentation and examples for PyKDE providing programming +General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. @@ -116,24 +126,17 @@ tips and working code you can use to learn from. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .inc -# Hack to get TQT include files under /opt -%__sed -i "configure.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export LD_RUN_PATH="%{tde_libdir}" export KDEDIR=%{tde_prefix} -#export LDFLAGS="${LDFLAGS} -lpython2.7" - export DH_OPTIONS -export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt @@ -189,7 +192,10 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.6.13-5 +- Build for Fedora 19 + +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.16.3-4 - Initial release for TDE 3.5.13.2 * Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3 diff --git a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec index 908c0ad57..e9c873191 100644 --- a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec +++ b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec @@ -1,10 +1,14 @@ +# Default version for this component +%define tde_pkg tde-i18n +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 +# TDE specific building variables +BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -14,26 +18,26 @@ BuildRequires: autoconf automake libtool m4 %define tde_tdedocdir %{tde_docdir}/tde # Builds all supported languages (not unsupported ones) -%if "%{?KDE_LANGS}" == "" -%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW +%if "%{?TDE_LANGS}" == "" +%define TDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW %endif -Name: trinity-i18n -Summary: Internationalization support for Trinity -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Internationalization support for Trinity +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops +License: GFDL +Group: User Interface/Desktops BuildArch: noarch # Speed build options @@ -41,7 +45,7 @@ BuildArch: noarch %define __spec_install_post %{nil} AutoReq: no -Source0: trinity-tde-i18n-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package Patch0: kde-i18n-kdesu.patch @@ -60,15 +64,15 @@ Patch4: trinity-tde-i18n-fr-3.5.13.2-updates.patch BuildRequires: findutils BuildRequires: gettext -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} %description %{summary}. %package Afrikaans -Summary: Afrikaans(af) language support for TDE -Group: User Interface/Desktops +Summary: Afrikaans(af) language support for TDE +Group: User Interface/Desktops Provides: %{name}-af = %{version}-%{release} Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release} Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} @@ -76,8 +80,8 @@ Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} %{summary}. %package Arabic -Summary: Arabic(ar) language support for TDE -Group: User Interface/Desktops +Summary: Arabic(ar) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ar = %{version}-%{release} Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} Provides: trinity-kde-i18n-Arabic = %{version}-%{release} @@ -85,8 +89,8 @@ Provides: trinity-kde-i18n-Arabic = %{version}-%{release} %{summary}. %package Azerbaijani -Summary: Azerbaijani(az) language support for TDE -Group: User Interface/Desktops +Summary: Azerbaijani(az) language support for TDE +Group: User Interface/Desktops Provides: %{name}-az = %{version}-%{release} Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} Provides: trinity-kde-i18n-Arabic = %{version}-%{release} @@ -94,8 +98,8 @@ Provides: trinity-kde-i18n-Arabic = %{version}-%{release} %{summary}. %package Belarusian -Summary: Belarusian(be) language support for TDE -Group: User Interface/Desktops +Summary: Belarusian(be) language support for TDE +Group: User Interface/Desktops Provides: %{name}-be = %{version}-%{release} Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release} Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} @@ -103,8 +107,8 @@ Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} %{summary}. %package Bulgarian -Summary: Bulgarian(bg) language support for TDE -Group: User Interface/Desktops +Summary: Bulgarian(bg) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bg = %{version}-%{release} Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release} Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} @@ -112,8 +116,8 @@ Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} %{summary}. %package Bengali -Summary: Bengali(bn) language support for TDE -Group: User Interface/Desktops +Summary: Bengali(bn) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bn = %{version}-%{release} Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release} Provides: trinity-kde-i18n-Bengali = %{version}-%{release} @@ -121,8 +125,8 @@ Provides: trinity-kde-i18n-Bengali = %{version}-%{release} %{summary}. %package Tibetan -Summary: Tibetan(bo) language support for TDE -Group: User Interface/Desktops +Summary: Tibetan(bo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bo = %{version}-%{release} Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release} Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} @@ -130,8 +134,8 @@ Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} %{summary}. %package Breton -Summary: Breton(br) language support for TDE -Group: User Interface/Desktops +Summary: Breton(br) language support for TDE +Group: User Interface/Desktops Provides: %{name}-br = %{version}-%{release} Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release} Provides: trinity-kde-i18n-Breton = %{version}-%{release} @@ -139,8 +143,8 @@ Provides: trinity-kde-i18n-Breton = %{version}-%{release} %{summary}. %package Bosnian -Summary: Bosnian(bs) language support for TDE -Group: User Interface/Desktops +Summary: Bosnian(bs) language support for TDE +Group: User Interface/Desktops Provides: %{name}-bs = %{version}-%{release} Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release} Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} @@ -148,8 +152,8 @@ Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} %{summary}. %package Catalan -Summary: Catalan(ca) language support for TDE -Group: User Interface/Desktops +Summary: Catalan(ca) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ca = %{version}-%{release} Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release} Provides: trinity-kde-i18n-Catalan = %{version}-%{release} @@ -157,8 +161,8 @@ Provides: trinity-kde-i18n-Catalan = %{version}-%{release} %{summary}. %package Czech -Summary: Czech(cs) language support for TDE -Group: User Interface/Desktops +Summary: Czech(cs) language support for TDE +Group: User Interface/Desktops Provides: %{name}-cs = %{version}-%{release} Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release} Provides: trinity-kde-i18n-Czech = %{version}-%{release} @@ -166,16 +170,16 @@ Provides: trinity-kde-i18n-Czech = %{version}-%{release} %{summary}. %package Cymraeg -Summary: Cymraeg language support for TDE -Group: User Interface/Desktops +Summary: Cymraeg language support for TDE +Group: User Interface/Desktops Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release} Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release} %description Cymraeg %{summary}. %package Welsh -Summary: Welsh(cy) language support for TDE -Group: User Interface/Desktops +Summary: Welsh(cy) language support for TDE +Group: User Interface/Desktops Provides: %{name}-cy = %{version}-%{release} Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release} Provides: trinity-kde-i18n-Welsh = %{version}-%{release} @@ -183,8 +187,8 @@ Provides: trinity-kde-i18n-Welsh = %{version}-%{release} %{summary}. %package Danish -Summary: Danish(da) language support for TDE -Group: User Interface/Desktops +Summary: Danish(da) language support for TDE +Group: User Interface/Desktops Provides: %{name}-da = %{version}-%{release} Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release} Provides: trinity-kde-i18n-Danish = %{version}-%{release} @@ -192,8 +196,8 @@ Provides: trinity-kde-i18n-Danish = %{version}-%{release} %{summary}. %package German -Summary: German(de) language support for TDE -Group: User Interface/Desktops +Summary: German(de) language support for TDE +Group: User Interface/Desktops Provides: %{name}-de = %{version}-%{release} Obsoletes: trinity-kde-i18n-German < %{version}-%{release} Provides: trinity-kde-i18n-German = %{version}-%{release} @@ -201,8 +205,8 @@ Provides: trinity-kde-i18n-German = %{version}-%{release} %{summary}. %package Greek -Summary: Greek(el) language support for TDE -Group: User Interface/Desktops +Summary: Greek(el) language support for TDE +Group: User Interface/Desktops Provides: %{name}-el = %{version}-%{release} Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release} Provides: trinity-kde-i18n-Greek = %{version}-%{release} @@ -210,8 +214,8 @@ Provides: trinity-kde-i18n-Greek = %{version}-%{release} %{summary}. %package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops +Summary: British(en_GB) English support for TDE +Group: User Interface/Desktops Provides: %{name}-en_GB = %{version}-%{release} Obsoletes: trinity-kde-i18n-British < %{version}-%{release} Provides: trinity-kde-i18n-British = %{version}-%{release} @@ -219,8 +223,8 @@ Provides: trinity-kde-i18n-British = %{version}-%{release} %{summary}. %package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops +Summary: Esperanto(eo) support for TDE +Group: User Interface/Desktops Provides: %{name}-eo = %{version}-%{release} Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release} Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} @@ -228,8 +232,8 @@ Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} %{summary}. %package Spanish -Summary: Spanish(es) language support for TDE -Group: User Interface/Desktops +Summary: Spanish(es) language support for TDE +Group: User Interface/Desktops Provides: %{name}-es = %{version}-%{release} Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release} Provides: trinity-kde-i18n-Spanish = %{version}-%{release} @@ -237,8 +241,8 @@ Provides: trinity-kde-i18n-Spanish = %{version}-%{release} %{summary}. %package Estonian -Summary: Estonian(et) language support for TDE -Group: User Interface/Desktops +Summary: Estonian(et) language support for TDE +Group: User Interface/Desktops Provides: %{name}-et = %{version}-%{release} Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release} Provides: trinity-kde-i18n-Estonian = %{version}-%{release} @@ -246,8 +250,8 @@ Provides: trinity-kde-i18n-Estonian = %{version}-%{release} %{summary}. %package Basque -Summary: Basque(eu) language support for TDE -Group: User Interface/Desktops +Summary: Basque(eu) language support for TDE +Group: User Interface/Desktops Provides: %{name}-eu = %{version}-%{release} Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release} Provides: trinity-kde-i18n-Basque = %{version}-%{release} @@ -255,8 +259,8 @@ Provides: trinity-kde-i18n-Basque = %{version}-%{release} %{summary}. %package Farsi -Summary: Farsi(fa) language support for TDE -Group: User Interface/Desktops +Summary: Farsi(fa) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fa = %{version}-%{release} Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release} Provides: trinity-kde-i18n-Farsi = %{version}-%{release} @@ -264,8 +268,8 @@ Provides: trinity-kde-i18n-Farsi = %{version}-%{release} %{summary}. %package Finnish -Summary: Finnish(fi) language support for TDE -Group: User Interface/Desktops +Summary: Finnish(fi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fi = %{version}-%{release} Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release} Provides: trinity-kde-i18n-Finnish = %{version}-%{release} @@ -273,8 +277,8 @@ Provides: trinity-kde-i18n-Finnish = %{version}-%{release} %{summary}. %package Faroese -Summary: Faroese(fo) language support for TDE -Group: User Interface/Desktops +Summary: Faroese(fo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fo = %{version}-%{release} Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release} Provides: trinity-kde-i18n-Faroese = %{version}-%{release} @@ -282,8 +286,8 @@ Provides: trinity-kde-i18n-Faroese = %{version}-%{release} %{summary}. %package French -Summary: French(fr) language support for TDE -Group: User Interface/Desktops +Summary: French(fr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fr = %{version}-%{release} Obsoletes: trinity-kde-i18n-French < %{version}-%{release} Provides: trinity-kde-i18n-French = %{version}-%{release} @@ -291,8 +295,8 @@ Provides: trinity-kde-i18n-French = %{version}-%{release} %{summary}. %package Frisian -Summary: Frisian(fy) language support for TDE -Group: User Interface/Desktops +Summary: Frisian(fy) language support for TDE +Group: User Interface/Desktops Provides: %{name}-fy = %{version}-%{release} Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release} Provides: trinity-kde-i18n-Frisian = %{version}-%{release} @@ -300,8 +304,8 @@ Provides: trinity-kde-i18n-Frisian = %{version}-%{release} %{summary}. %package Irish -Summary: Irish(ga) language support for TDE -Group: User Interface/Desktops +Summary: Irish(ga) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ga = %{version}-%{release} Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release} Provides: trinity-kde-i18n-Irish = %{version}-%{release} @@ -309,8 +313,8 @@ Provides: trinity-kde-i18n-Irish = %{version}-%{release} %{summary}. %package Galician -Summary: Galician(gl) language support for TDE -Group: User Interface/Desktops +Summary: Galician(gl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-gl = %{version}-%{release} Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release} Provides: trinity-kde-i18n-Galician = %{version}-%{release} @@ -318,8 +322,8 @@ Provides: trinity-kde-i18n-Galician = %{version}-%{release} %{summary}. %package Hebrew -Summary: Hebrew(he) language support for TDE -Group: User Interface/Desktops +Summary: Hebrew(he) language support for TDE +Group: User Interface/Desktops Provides: %{name}-he = %{version}-%{release} Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release} Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} @@ -327,8 +331,8 @@ Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} %{summary}. %package Hindi -Summary: Hindi(hi) language support for TDE -Group: User Interface/Desktops +Summary: Hindi(hi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hi = %{version}-%{release} Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release} Provides: trinity-kde-i18n-Hindi = %{version}-%{release} @@ -336,8 +340,8 @@ Provides: trinity-kde-i18n-Hindi = %{version}-%{release} %{summary}. %package Croatian -Summary: Croatian(hr) language support for TDE -Group: User Interface/Desktops +Summary: Croatian(hr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hr = %{version}-%{release} Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release} Provides: trinity-kde-i18n-Croatian = %{version}-%{release} @@ -345,8 +349,8 @@ Provides: trinity-kde-i18n-Croatian = %{version}-%{release} %{summary}. %package Hungarian -Summary: Hungarian(hu) language support for TDE -Group: User Interface/Desktops +Summary: Hungarian(hu) language support for TDE +Group: User Interface/Desktops Provides: %{name}-hu = %{version}-%{release} Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release} Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} @@ -354,8 +358,8 @@ Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} %{summary}. %package Indonesian -Summary: Indonesian(id) language support for TDE -Group: User Interface/Desktops +Summary: Indonesian(id) language support for TDE +Group: User Interface/Desktops Provides: %{name}-id = %{version}-%{release} Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release} Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} @@ -363,8 +367,8 @@ Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} %{summary}. %package Icelandic -Summary: Icelandic(is) language support for TDE -Group: User Interface/Desktops +Summary: Icelandic(is) language support for TDE +Group: User Interface/Desktops Provides: %{name}-is = %{version}-%{release} Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release} Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} @@ -372,8 +376,8 @@ Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} %{summary}. %package Italian -Summary: Italian(it) language support for TDE -Group: User Interface/Desktops +Summary: Italian(it) language support for TDE +Group: User Interface/Desktops Provides: %{name}-it = %{version}-%{release} Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release} Provides: trinity-kde-i18n-Italian = %{version}-%{release} @@ -381,8 +385,8 @@ Provides: trinity-kde-i18n-Italian = %{version}-%{release} %{summary}. %package Japanese -Summary: Japanese(ja) language support for TDE -Group: User Interface/Desktops +Summary: Japanese(ja) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ja = %{version}-%{release} Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release} Provides: trinity-kde-i18n-Japanese = %{version}-%{release} @@ -390,8 +394,8 @@ Provides: trinity-kde-i18n-Japanese = %{version}-%{release} %{summary}. %package Korean -Summary: Korean(ko) language support for TDE -Group: User Interface/Desktops +Summary: Korean(ko) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ko = %{version}-%{release} Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release} Provides: trinity-kde-i18n-Korean = %{version}-%{release} @@ -399,8 +403,8 @@ Provides: trinity-kde-i18n-Korean = %{version}-%{release} %{summary}. %package Kurdish -Summary: Kurdish(ku) language support for TDE -Group: User Interface/Desktops +Summary: Kurdish(ku) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ku = %{version}-%{release} Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release} Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} @@ -408,8 +412,8 @@ Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} %{summary}. %package Lao -Summary: Lao(lo) language support for TDE -Group: User Interface/Desktops +Summary: Lao(lo) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lo = %{version}-%{release} Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release} Provides: trinity-kde-i18n-Lao = %{version}-%{release} @@ -417,8 +421,8 @@ Provides: trinity-kde-i18n-Lao = %{version}-%{release} %{summary}. %package Lithuanian -Summary: Lithuanian(lt) language support for TDE -Group: User Interface/Desktops +Summary: Lithuanian(lt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lt = %{version}-%{release} Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release} Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} @@ -426,8 +430,8 @@ Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} %{summary}. %package Latvian -Summary: Latvian(lv) language support for TDE -Group: User Interface/Desktops +Summary: Latvian(lv) language support for TDE +Group: User Interface/Desktops Provides: %{name}-lv = %{version}-%{release} Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release} Provides: trinity-kde-i18n-Latvian = %{version}-%{release} @@ -435,8 +439,8 @@ Provides: trinity-kde-i18n-Latvian = %{version}-%{release} %{summary}. %package Maori -Summary: Maori(mi) language support for TDE -Group: User Interface/Desktops +Summary: Maori(mi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mi = %{version}-%{release} Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release} Provides: trinity-kde-i18n-Maori = %{version}-%{release} @@ -444,8 +448,8 @@ Provides: trinity-kde-i18n-Maori = %{version}-%{release} %{summary}. %package Macedonian -Summary: Macedonian(mk) language support for TDE -Group: User Interface/Desktops +Summary: Macedonian(mk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mk = %{version}-%{release} Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release} Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} @@ -453,8 +457,8 @@ Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} %{summary}. %package Maltese -Summary: Maltese(mt) language support for TDE -Group: User Interface/Desktops +Summary: Maltese(mt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-mt = %{version}-%{release} Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release} Provides: trinity-kde-i18n-Maltese = %{version}-%{release} @@ -462,8 +466,8 @@ Provides: trinity-kde-i18n-Maltese = %{version}-%{release} %{summary}. %package Dutch -Summary: Dutch(nl) language support for TDE -Group: User Interface/Desktops +Summary: Dutch(nl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-nl = %{version}-%{release} Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release} Provides: trinity-kde-i18n-Dutch = %{version}-%{release} @@ -471,8 +475,8 @@ Provides: trinity-kde-i18n-Dutch = %{version}-%{release} %{summary}. %package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for TDE -Group: User Interface/Desktops +Summary: Norwegian(no) (Bokmaal) language support for TDE +Group: User Interface/Desktops Provides: %{name}-no = %{version}-%{release} Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release} Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} @@ -480,8 +484,8 @@ Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} %{summary}. %package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for TDE -Group: User Interface/Desktops +Summary: Norwegian(nn) (Nynorsk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-nn = %{version}-%{release} Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release} Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} @@ -489,8 +493,8 @@ Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} %{summary}. %package Occitan -Summary: Occitan(oc) language support for TDE -Group: User Interface/Desktops +Summary: Occitan(oc) language support for TDE +Group: User Interface/Desktops Provides: %{name}-oc = %{version}-%{release} Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release} Provides: trinity-kde-i18n-Occitan = %{version}-%{release} @@ -498,8 +502,8 @@ Provides: trinity-kde-i18n-Occitan = %{version}-%{release} %{summary}. %package Polish -Summary: Polish(pl) language support for TDE -Group: User Interface/Desktops +Summary: Polish(pl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pl = %{version}-%{release} Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release} Provides: trinity-kde-i18n-Polish = %{version}-%{release} @@ -507,8 +511,8 @@ Provides: trinity-kde-i18n-Polish = %{version}-%{release} %{summary}. %package Portuguese -Summary: Portuguese(pt) language support for TDE -Group: User Interface/Desktops +Summary: Portuguese(pt) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pt = %{version}-%{release} Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release} Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} @@ -516,8 +520,8 @@ Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} %{summary}. %package Punjabi -Summary: Punjabi(pa) language support for TDE -Group: User Interface/Desktops +Summary: Punjabi(pa) language support for TDE +Group: User Interface/Desktops Provides: %{name}-pa = %{version}-%{release} Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release} Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} @@ -525,8 +529,8 @@ Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} %{summary}. %package Brazil -Summary: Brazil(pt_BR) Portuguese language support for TDE -Group: User Interface/Desktops +Summary: Brazil(pt_BR) Portuguese language support for TDE +Group: User Interface/Desktops Provides: %{name}-pt_BR = %{version}-%{release} Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release} Provides: trinity-kde-i18n-Brazil = %{version}-%{release} @@ -534,8 +538,8 @@ Provides: trinity-kde-i18n-Brazil = %{version}-%{release} %{summary}. %package Romanian -Summary: Romanian(ro) language support for TDE -Group: User Interface/Desktops +Summary: Romanian(ro) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ro = %{version}-%{release} Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release} Provides: trinity-kde-i18n-Romanian = %{version}-%{release} @@ -543,8 +547,8 @@ Provides: trinity-kde-i18n-Romanian = %{version}-%{release} %{summary}. %package Russian -Summary: Russian(ru) language support for TDE -Group: User Interface/Desktops +Summary: Russian(ru) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ru = %{version}-%{release} Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release} Provides: trinity-kde-i18n-Russian = %{version}-%{release} @@ -552,8 +556,8 @@ Provides: trinity-kde-i18n-Russian = %{version}-%{release} %{summary}. %package Slovak -Summary: Slovak(sk) language support for TDE -Group: User Interface/Desktops +Summary: Slovak(sk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sk = %{version}-%{release} Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release} Provides: trinity-kde-i18n-Slovak = %{version}-%{release} @@ -561,8 +565,8 @@ Provides: trinity-kde-i18n-Slovak = %{version}-%{release} %{summary}. %package Slovenian -Summary: Slovenian(sl) language support for TDE -Group: User Interface/Desktops +Summary: Slovenian(sl) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sl = %{version}-%{release} Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release} Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} @@ -570,8 +574,8 @@ Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} %{summary}. %package Serbian -Summary: Serbian(sr) language support for TDE -Group: User Interface/Desktops +Summary: Serbian(sr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sr = %{version}-%{release} Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release} Provides: trinity-kde-i18n-Serbian = %{version}-%{release} @@ -579,8 +583,8 @@ Provides: trinity-kde-i18n-Serbian = %{version}-%{release} %{summary}. %package Swedish -Summary: Swedish(sv) language support for TDE -Group: User Interface/Desktops +Summary: Swedish(sv) language support for TDE +Group: User Interface/Desktops Provides: %{name}-sv = %{version}-%{release} Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release} Provides: trinity-kde-i18n-Swedish = %{version}-%{release} @@ -588,8 +592,8 @@ Provides: trinity-kde-i18n-Swedish = %{version}-%{release} %{summary}. %package Tamil -Summary: Tamil(ta) language support for TDE -Group: User Interface/Desktops +Summary: Tamil(ta) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ta = %{version}-%{release} Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release} Provides: trinity-kde-i18n-Tamil = %{version}-%{release} @@ -597,8 +601,8 @@ Provides: trinity-kde-i18n-Tamil = %{version}-%{release} %{summary}. %package Tajik -Summary: Tajik(tg) language support for TDE -Group: User Interface/Desktops +Summary: Tajik(tg) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tg = %{version}-%{release} Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release} Provides: trinity-kde-i18n-Tajik = %{version}-%{release} @@ -606,8 +610,8 @@ Provides: trinity-kde-i18n-Tajik = %{version}-%{release} %{summary}. %package Thai -Summary: Thai(th) language support for TDE -Group: User Interface/Desktops +Summary: Thai(th) language support for TDE +Group: User Interface/Desktops Provides: %{name}-th = %{version}-%{release} Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release} Provides: trinity-kde-i18n-Thai = %{version}-%{release} @@ -615,8 +619,8 @@ Provides: trinity-kde-i18n-Thai = %{version}-%{release} %{summary}. %package Turkish -Summary: Turkish(tr) language support for TDE -Group: User Interface/Desktops +Summary: Turkish(tr) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tr = %{version}-%{release} Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release} Provides: trinity-kde-i18n-Turkish = %{version}-%{release} @@ -624,8 +628,8 @@ Provides: trinity-kde-i18n-Turkish = %{version}-%{release} %{summary}. %package Ukrainian -Summary: Ukrainian(uk) language support for TDE -Group: User Interface/Desktops +Summary: Ukrainian(uk) language support for TDE +Group: User Interface/Desktops Provides: %{name}-uk = %{version}-%{release} Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release} Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} @@ -633,8 +637,8 @@ Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} %{summary}. %package Venda -Summary: Venda(ven) language support for TDE -Group: User Interface/Desktops +Summary: Venda(ven) language support for TDE +Group: User Interface/Desktops Provides: %{name}-ven = %{version}-%{release} Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release} Provides: trinity-kde-i18n-Venda = %{version}-%{release} @@ -642,8 +646,8 @@ Provides: trinity-kde-i18n-Venda = %{version}-%{release} %{summary}. %package Vietnamese -Summary: Vietnamese(vi) language support for TDE -Group: User Interface/Desktops +Summary: Vietnamese(vi) language support for TDE +Group: User Interface/Desktops Provides: %{name}-vi = %{version}-%{release} Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release} Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} @@ -651,8 +655,8 @@ Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} %{summary}. %package Walloon -Summary: Walloon(wa) language support for TDE -Group: User Interface/Desktops +Summary: Walloon(wa) language support for TDE +Group: User Interface/Desktops Provides: %{name}-wa = %{version}-%{release} Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release} Provides: trinity-kde-i18n-Walloon = %{version}-%{release} @@ -660,8 +664,8 @@ Provides: trinity-kde-i18n-Walloon = %{version}-%{release} %{summary}. %package Xhosa -Summary: Xhosa(xh) (a Bantu language) support for TDE -Group: User Interface/Desktops +Summary: Xhosa(xh) (a Bantu language) support for TDE +Group: User Interface/Desktops Provides: %{name}-xh = %{version}-%{release} Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release} Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} @@ -669,8 +673,8 @@ Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} %{summary}. %package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE -Group: User Interface/Desktops +Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE +Group: User Interface/Desktops Provides: %{name}-zh_CN = %{version}-%{release} Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release} Provides: trinity-kde-i18n-Chinese = %{version}-%{release} @@ -678,8 +682,8 @@ Provides: trinity-kde-i18n-Chinese = %{version}-%{release} %{summary}. %package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for TDE -Group: User Interface/Desktops +Summary: Chinese(zh_TW) (Big5) language support for TDE +Group: User Interface/Desktops Provides: %{name}-tz_TW = %{version}-%{release} Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release} Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release} @@ -689,7 +693,7 @@ Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release} %prep -%setup -q -n trinity-tde-i18n-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Patches for French translations pushd tde-i18n-fr @@ -704,12 +708,6 @@ pushd tde-i18n-zh_TW zcat %{PATCH3} | patch -p1 || : popd -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -717,12 +715,12 @@ popd %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR=%{tde_prefix} export kde_htmldir="%{tde_tdedocdir}/HTML" -for l in %{KDE_LANGS}; do +( +for l in %{TDE_LANGS}; do for f in tde-i18n-${l}/; do if [ -d "${f}" ]; then pushd ${f} @@ -740,14 +738,21 @@ for l in %{KDE_LANGS}; do fi done done +) 2>&1 | tee /tmp/rpmbuild.$$ + +if grep -q Error /tmp/rpmbuild.$$; then + echo Error while building. See '/tmp/rpmbuild.$$' + exit 1 +fi wait +rm -f /tmp/rpmbuild.$$ %install %__rm -rf %{?buildroot} export PATH="%{tde_bindir}:${PATH}" -for l in %{KDE_LANGS}; do +for l in %{TDE_LANGS}; do for f in tde-i18n-${l}/; do if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then %__make install DESTDIR="%{?buildroot}" -C "${f}" @@ -805,444 +810,444 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %clean %__rm -rf %{buildroot} -%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w af <<< '%{TDE_LANGS}' )" != "" %files Afrikaans %defattr(-,root,root,-) %lang(af) %{tde_datadir}/locale/af/* %lang(af) %{tde_tdedocdir}/HTML/af/ %endif -%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != "" %files Arabic %defattr(-,root,root,-) %lang(ar) %{tde_datadir}/locale/ar/* %endif -%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w az <<< '%{TDE_LANGS}' )" != "" %files Azerbaijani %defattr(-,root,root,-) %lang(az) %{tde_datadir}/locale/az/* %endif -%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w be <<< '%{TDE_LANGS}' )" != "" %files Belarusian %defattr(-,root,root,-) %lang(be) %{tde_datadir}/locale/be/* %endif -%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != "" %files Bulgarian %defattr(-,root,root,-) %lang(bg) %{tde_datadir}/locale/bg/* %endif -%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != "" %files Bengali %defattr(-,root,root,-) %lang(bn) %{tde_datadir}/locale/bn/* %endif -%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != "" %files Tibetan %defattr(-,root,root,-) %lang(bo) %{tde_datadir}/locale/bo/* %endif -%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w br <<< '%{TDE_LANGS}' )" != "" %files Breton %defattr(-,root,root,-) %lang(br) %{tde_datadir}/locale/br/* %endif -%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != "" %files Bosnian %defattr(-,root,root,-) %lang(bs) %{tde_datadir}/locale/bs/* %endif -%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != "" %files Catalan %defattr(-,root,root,-) %lang(ca) %{tde_datadir}/locale/ca/* %lang(ca) %{tde_tdedocdir}/HTML/ca/ %endif -%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" %files Czech %defattr(-,root,root,-) %lang(cs) %{tde_datadir}/locale/cs/* %lang(cs) %{tde_tdedocdir}/HTML/cs/ %endif -%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != "" %files Welsh %defattr(-,root,root,-) %lang(cy) %{tde_datadir}/locale/cy/* %endif -%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w da <<< '%{TDE_LANGS}' )" != "" %files Danish %defattr(-,root,root,-) %lang(da) %{tde_datadir}/locale/da/* %lang(da) %{tde_tdedocdir}/HTML/da/ %endif -%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w de <<< '%{TDE_LANGS}' )" != "" %files German %defattr(-,root,root,-) %lang(de) %{tde_datadir}/locale/de/* %lang(de) %{tde_tdedocdir}/HTML/de/ %endif -%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w el <<< '%{TDE_LANGS}' )" != "" %files Greek %defattr(-,root,root,-) %lang(el) %{tde_datadir}/locale/el/* %endif -%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != "" %files British %defattr(-,root,root,-) %lang(en_GB) %{tde_datadir}/locale/en_GB/* %lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/ %endif -%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != "" %files Esperanto %defattr(-,root,root,-) %lang(eo) %{tde_datadir}/locale/eo/* %endif -%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w es <<< '%{TDE_LANGS}' )" != "" %files Spanish %defattr(-,root,root,-) %lang(es) %{tde_datadir}/locale/es/* %lang(es) %{tde_tdedocdir}/HTML/es/ %endif -%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w et <<< '%{TDE_LANGS}' )" != "" %files Estonian %defattr(-,root,root,-) %lang(et) %{tde_datadir}/locale/et/* %lang(et) %{tde_tdedocdir}/HTML/et/ %endif -%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != "" %files Basque %defattr(-,root,root,-) %lang(eu) %{tde_datadir}/locale/eu/* %endif -%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != "" %files Farsi %defattr(-,root,root,-) %lang(fa) %{tde_datadir}/locale/fa/* %endif -%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != "" %files Finnish %defattr(-,root,root,-) %lang(fi) %{tde_datadir}/locale/fi/* %lang(fi) %{tde_tdedocdir}/HTML/fi/ %endif -%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != "" %files Faroese %defattr(-,root,root,-) %lang(fo) %{tde_datadir}/locale/fo/* %endif -%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != "" %files French %defattr(-,root,root,-) %lang(fr) %{tde_datadir}/locale/fr/* %lang(fr) %{tde_tdedocdir}/HTML/fr/ %endif -%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != "" %files Frisian %defattr(-,root,root,-) %lang(fy) %{tde_datadir}/locale/fy/* %endif -%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != "" %files Irish %defattr(-,root,root,-) %lang(ga) %{tde_datadir}/locale/ga/* %endif -%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != "" %files Galician %defattr(-,root,root,-) %lang(gl) %{tde_datadir}/locale/gl/* %endif -%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w he <<< '%{TDE_LANGS}' )" != "" %files Hebrew %defattr(-,root,root,-) %lang(he) %{tde_datadir}/locale/he/* %lang(he) %{tde_tdedocdir}/HTML/he/ %endif -%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != "" %files Hindi %defattr(-,root,root,-) %lang(hi) %{tde_datadir}/locale/hi/* %endif -%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != "" %files Croatian %defattr(-,root,root,-) %lang(hr) %{tde_datadir}/locale/hr/* %lang(hr) %{tde_tdedocdir}/HTML/hr/ %endif -%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" %files Hungarian %defattr(-,root,root,-) %lang(hu) %{tde_datadir}/locale/hu/* %lang(hu) %{tde_tdedocdir}/HTML/hu/ %endif -%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" %files Indonesian %defattr(-,root,root,-) %lang(id) %{tde_datadir}/locale/id/* %lang(id) %{tde_tdedocdir}/HTML/id/ %endif -%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w is <<< '%{TDE_LANGS}' )" != "" %files Icelandic %defattr(-,root,root,-) %lang(is) %{tde_datadir}/locale/is/* %endif -%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w it <<< '%{TDE_LANGS}' )" != "" %files Italian %defattr(-,root,root,-) %lang(it) %{tde_datadir}/locale/it/* %lang(it) %{tde_tdedocdir}/HTML/it/ %endif -%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" %files Japanese %defattr(-,root,root,-) %lang(ja) %{tde_datadir}/locale/ja/* %lang(ja) %{tde_tdedocdir}/HTML/ja/ %endif -%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" %files Korean %defattr(-,root,root,-) %lang(ko) %{tde_datadir}/locale/ko/* %lang(ko) %{tde_tdedocdir}/HTML/ko/ %endif -%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" %files Kurdish %defattr(-,root,root,-) %lang(ku) %{tde_datadir}/locale/ku/* %lang(ku) %{tde_tdedocdir}/HTML/ku/ %endif -%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" %files Lao %defattr(-,root,root,-) %lang(lo) %{tde_datadir}/locale/lo/* %lang(lo) %{tde_tdedocdir}/HTML/lo/ %endif -%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != "" %files Lithuanian %defattr(-,root,root,-) %lang(lt) %{tde_datadir}/locale/lt/* %endif -%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) %lang(lv) %{tde_datadir}/locale/lv/* %endif -%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != "" %files Maori %defattr(-,root,root,-) %lang(mi) %{tde_datadir}/locale/mi/* %endif -%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != "" %files Macedonian %defattr(-,root,root,-) %lang(mk) %{tde_datadir}/locale/mk/* %endif -%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != "" %files Maltese %defattr(-,root,root,-) %lang(mt) %{tde_datadir}/locale/mt/* %endif -%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != "" %files Dutch %defattr(-,root,root,-) %lang(nl) %{tde_datadir}/locale/nl/* %lang(nl) %{tde_tdedocdir}/HTML/nl/ %endif -%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != "" %files Norwegian %defattr(-,root,root,-) %lang(nb) %{tde_datadir}/locale/nb/* #%lang(nb) %{tde_tdedocdir}/HTML/nb/ %endif -%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" %files Norwegian-Nynorsk %defattr(-,root,root,-) %lang(nn) %{tde_datadir}/locale/nn/* #%lang(nn) %{tde_tdedocdir}/HTML/nn/ %endif -%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != "" %files Occitan %defattr(-,root,root,-) %lang(oc) %{tde_datadir}/locale/oc/* %endif -%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != "" %files Punjabi %defattr(-,root,root,-) %lang(pa) %{tde_datadir}/locale/pa/* %endif -%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != "" %files Polish %defattr(-,root,root,-) %lang(pl) %{tde_datadir}/locale/pl/* %lang(pl) %{tde_tdedocdir}/HTML/pl/ %endif -%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != "" %files Portuguese %defattr(-,root,root,-) %lang(pt) %{tde_datadir}/locale/pt/* %lang(pt) %{tde_tdedocdir}/HTML/pt/ %endif -%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != "" %files Brazil %defattr(-,root,root,-) %lang(pt_BR) %{tde_datadir}/locale/pt_BR/* %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/ %endif -%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != "" %files Romanian %defattr(-,root,root,-) %lang(ro) %{tde_datadir}/locale/ro/* %lang(ro) %{tde_tdedocdir}/HTML/ro/ %endif -%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != "" %files Russian %defattr(-,root,root,-) %lang(ru) %{tde_datadir}/locale/ru/* %lang(ru) %{tde_tdedocdir}/HTML/ru/ %endif -%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != "" %files Slovak %defattr(-,root,root,-) %lang(sk) %{tde_datadir}/locale/sk/* %lang(sk) %{tde_tdedocdir}/HTML/sk/ %endif -%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != "" %files Slovenian %defattr(-,root,root,-) %lang(sl) %{tde_datadir}/locale/sl/* %lang(sl) %{tde_tdedocdir}/HTML/sl/ %endif -%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != "" %files Serbian %defattr(-,root,root,-) %lang(sr) %{tde_datadir}/locale/sr/* %lang(sr) %{tde_tdedocdir}/HTML/sr/ %endif -%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != "" %files Swedish %defattr(-,root,root,-) %lang(sv) %{tde_datadir}/locale/sv/* %lang(sv) %{tde_tdedocdir}/HTML/sv/ %endif -%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != "" %files Tamil %defattr(-,root,root,-) %lang(ta) %{tde_datadir}/locale/ta/* %endif -%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != "" %files Tajik %defattr(-,root,root,-) %lang(tg) %{tde_datadir}/locale/tg/* %endif -%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w th <<< '%{TDE_LANGS}' )" != "" %files Thai %defattr(-,root,root,-) %lang(th) %{tde_datadir}/locale/th/* %endif -%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != "" %files Turkish %defattr(-,root,root,-) %lang(tr) %{tde_datadir}/locale/tr/* %lang(tr) %{tde_tdedocdir}/HTML/tr/ %endif -%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" %files Ukrainian %defattr(-,root,root,-) %lang(uk) %{tde_tdedocdir}/HTML/uk/ %lang(uk) %{tde_datadir}/locale/uk/* %endif -%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != "" %files Venda %defattr(-,root,root,-) %lang(ven) %{tde_datadir}/locale/ven/* %endif -%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != "" %files Vietnamese %defattr(-,root,root,-) %lang(vi) %{tde_datadir}/locale/vi/* %endif -%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != "" %files Walloon %defattr(-,root,root,-) %lang(wa) %{tde_datadir}/locale/wa/* %endif -%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != "" %files Xhosa %defattr(-,root,root,-) %lang(xh) %{tde_datadir}/locale/xh/* %lang(xh) %{tde_tdedocdir}/HTML/xh/ %endif -%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" %files Chinese %defattr(-,root,root,-) %lang(zh_CN) %{tde_datadir}/locale/zh_CN/* %lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/ %endif -%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" +%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" %files Chinese-Big5 %defattr(-,root,root,-) %lang(zh_TW) %{tde_datadir}/locale/zh_TW/* @@ -1250,6 +1255,9 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %endif %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec index fcd506a32..329aaaf95 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -18,29 +20,29 @@ %define _docdir %{tde_docdir} -Summary: Trinity Desktop Environment - Accessibility -Name: trinity-tdeaccessibility -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Trinity Desktop Environment - Accessibility +Name: trinity-tdeaccessibility +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPLv2 -Group: User Interface/Desktops +License: GPLv2 +Group: User Interface/Desktops -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils BuildRequires: trinity-akode-devel -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} BuildRequires: alsa-lib-devel @@ -441,12 +443,6 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -456,7 +452,6 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Avoids conflict with KDE4, if installed # see file: '/etc/profile.d/kde.sh' from package 'kde-settings' @@ -475,15 +470,17 @@ fi --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ - --enable-closure \ - --disable-debug --disable-warnings \ --enable-final \ + --enable-closure \ + --enable-rpath \ + \ --enable-ksayit-audio-plugins \ - --with-akode \ - --with-extra-includes=%{tde_includedir}:%{tde_includedir}/tqt - + --with-akode + %__make %{?_smp_mflags} @@ -492,28 +489,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# file lists for locale -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}/$HTML_DIR ]; then - for lang_dir in %{buildroot}/$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common - done - popd - fi - done -fi - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec index c998a3b72..8266a566e 100644 --- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -19,7 +21,7 @@ Name: trinity-tdeaddons Summary: Trinity Desktop Environment - Plugins -Version: 3.5.13.2 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -41,13 +43,13 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdebase-devel >= %{version} -BuildRequires: trinity-tdegames-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} -BuildRequires: trinity-tdepim-devel >= %{version} -BuildRequires: trinity-tqtinterface-devel >= %{version} +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: trinity-tdegames-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} +BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: SDL-devel BuildRequires: alsa-lib-devel @@ -73,8 +75,6 @@ BuildRequires: libdb-4_8-devel #BuildRequires: xmms-devel #%endif -#Requires: which - Requires: trinity-atlantikdesigner = %{version}-%{release} Requires: trinity-kaddressbook-plugins = %{version}-%{release} Requires: trinity-kate-plugins = %{version}-%{release} @@ -676,12 +676,6 @@ done %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -690,7 +684,6 @@ done %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # Note about DB4: @@ -703,17 +696,21 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ + --enable-final \ --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt:%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts:%{tde_includedir} \ + --enable-rpath \ + \ + --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \ + \ %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ --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 @@ -727,29 +724,15 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# File lists for locale -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}/$HTML_DIR ]; then - for lang_dir in %{buildroot}/$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi - done -fi - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/tdeadmin/tdeadmin-3.5.13.2.spec index 3687ce230..9947f69a8 100644 --- a/redhat/tdeadmin/tdeadmin-3.5.13.2.spec +++ b/redhat/tdeadmin/tdeadmin-3.5.13.2.spec @@ -24,7 +24,7 @@ Name: trinity-tdeadmin Summary: Administrative tools for TDE Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: User Interface/Desktops @@ -47,9 +47,9 @@ Source6: ksysvrc Source7: kuserrc BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: rpm-devel BuildRequires: pam-devel %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -377,12 +377,6 @@ touch /etc/lilo.conf %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -391,7 +385,6 @@ touch /etc/lilo.conf %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Do not build against any "/usr" installed KDE export KDEDIR=%{tde_prefix} @@ -415,9 +408,7 @@ fi --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath \ \ --with-rpm \ --with-pam=kde \ @@ -478,5 +469,8 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2-fix_update_screensaver_list.patch b/redhat/tdeartwork/tdeartwork-3.5.13.2-fix_update_screensaver_list.patch new file mode 100644 index 000000000..4277d6856 --- /dev/null +++ b/redhat/tdeartwork/tdeartwork-3.5.13.2-fix_update_screensaver_list.patch @@ -0,0 +1,57 @@ +--- trinity-tdeartwork/kscreensaver/kxsconfig/update_hacks.sh.ORI 2013-07-31 11:08:50.105439282 +0200 ++++ trinity-tdeartwork/kscreensaver/kxsconfig/update_hacks.sh 2013-07-31 11:22:06.146113235 +0200 +@@ -1,18 +1,50 @@ + #!/bin/sh +-scsvs=`cd /usr/lib/xscreensaver/ && ls -1 | grep -v config` ++ ++# Checks for Xscreensaver directory (may vary on different distributions) ++if [ -d /usr/libexec/xscreensaver ]; then ++ XSDIR=/usr/libexec/xscreensaver ++elif [ -d /usr/lib64/xscreensaver ]; then ++ XSDIR=/usr/lib64/xscreensaver ++else ++ XSDIR=/usr/lib/xscreensaver ++fi ++ ++# Gets list of screensavers. Exclude 'config'. ++scsvs="" ++pushd "${XSDIR}" >/dev/null ++for i in *; do ++ if [ "${i}" != "config" ]; then ++ scsvs="${scsvs} ${i}" ++ fi ++done ++popd >/dev/null ++ + echo $scsvs ++ ++# Removes useless .desktop files, if any ++for f in ScreenSavers/*.desktop; do ++ # Gets the command line for this screensaver ++ Exec="$(sed -n '/^Exec=kxsconfig / s/.* \(.*\)/\1/' $f)" ++ if [ ! -x "${XSDIR}/${Exec}" ]; then ++ echo "Removing ${f}" ++ rm -f "${f}" ++ fi ++done ++ ++# Creates missing screensavers .desktop files + for name in $scsvs; do +- if test -f /usr/lib/xscreensaver/$name && test -f /usr/share/xscreensaver/config/$name.xml && test ! -f ScreenSavers/$name.desktop; then ++ if test -f "${XSDIR}/$name" && test -f "/usr/share/xscreensaver/config/$name.xml" && test ! -f "ScreenSavers/$name.desktop"; then + echo "name: $name" + label=`grep '<screensaver.*_label' /usr/share/xscreensaver/config/$name.xml | sed -e 's#^.*_label=\"\(.*\)\".*$#\1#'` + echo "label: $label" + f=ScreenSavers/$name.desktop + sed -e "s#@NAME@#$name#; s#@LABEL@#$label#" ScreenSavers/xscreensaver.template > $f +- if ldd /usr/lib/xscreensaver/$name 2>&1 | grep libGL; then ++ if ldd "${XSDIR}/$name" 2>&1 | grep libGL; then + sed -e "s,@GL1@,X-KDE-Category=OpenGL Screen Savers,; s,@GL2@,X-KDE-Type=OpenGL," $f > $f.new + else + grep -v @GL $f > $f.new + fi + mv $f.new $f + fi +-done ++done ++ diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec index 62547450d..e96101a2c 100644 --- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec +++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -20,8 +22,8 @@ Name: trinity-tdeartwork Summary: Additional artwork (themes, sound themes, ...) for TDE -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: User Interface/Desktops @@ -33,9 +35,11 @@ Url: http://www.trinitydesktop.org/ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tdeartwork-3.5.13.2-fix_update_screensaver_list.patch BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tdebase-devel >= %{version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: gettext BuildRequires: esound-devel @@ -129,7 +133,7 @@ technological superiority of the Unix operating system. This metapackage includes a collection of artistic extras (themes, widget styles, screen savers, wallpaper, icons, emoticons and so on) provided -with the official release of KDE. +with the official release of TDE. Homepage: http://artist.kde.org @@ -143,9 +147,9 @@ Group: User Interface/Desktops %description emoticons This package contains several collections of emoticons used by official -and unofficial KDE chat clients, such as Kopete and Konversation. +and unofficial TDE chat clients, such as Kopete and Konversation. -This package is part of KDE, and a component of the KDE artwork module. +This package is part of TDE, and a component of the TDE artwork module. %files emoticons %defattr(-,root,root,-) @@ -158,7 +162,7 @@ Summary: various multimedia goodies released with TDE Group: User Interface/Desktops %description misc -This package contains miscellaneous multimedia goodies for KDE. +This package contains miscellaneous multimedia goodies for TDE. Included are additional TDE sounds and kworldclock themes. This package is part of Trinity, and a component of the TDE artwork module. @@ -201,7 +205,7 @@ Provides: trinity-kdeartwork-icons = %{version}-%{release} %description theme-icon This package contains additional icon themes for Trinity. Icon themes can be -used to customise the appearance of standard icons throughout KDE. They +used to customise the appearance of standard icons throughout TDE. They can be applied using the icon manager in the Trinity Control Centre. This package is part of Trinity, and a component of the TDE artwork module. @@ -238,8 +242,8 @@ This package is part of Trinity, and a component of the TDE artwork module. %files theme-window %defattr(-,root,root,-) -%{tde_tdelibdir}/[kt]win* -%{tde_datadir}/apps/[kt]win/ +%{tde_tdelibdir}/kwin* +%{tde_datadir}/apps/kwin/ ########## @@ -333,7 +337,7 @@ This package is part of Trinity, and a component of the TDE artwork module. %package -n trinity-kscreensaver-xsavers Summary: Trinity hooks for standard xscreensavers Group: User Interface/Desktops -Requires: trinity-tdebase-bin >= 3.5.13 +Requires: trinity-tdebase-bin >= %{tde_version} Requires: xscreensaver %description -n trinity-kscreensaver-xsavers @@ -607,17 +611,43 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop %{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop -# These screensavers do not exist on OpenSuse 12.2 -%if 0%{?suse_version} == 0 +# These screensavers do not exist on OpenSuse +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop %endif -# These screensavers do not exist on Mageia 2 and Mandriva 2011 -%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0 +# These screensavers do not exist on Mageia / Mandriva +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop %{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop %{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop %endif +%if 0%{?rhel} == 6 +%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop +%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop +%endif + +%if 0%{?mgaversion} +%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop +%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop +%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop +%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop +%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop +%endif + +%if 0%{?fedora} >= 19 +%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop +%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop +%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop +%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop +%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop +%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop +%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop +%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop +%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop +%endif + %endif ########## @@ -630,14 +660,18 @@ This package is part of Trinity, and a component of the TDE artwork module. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .screenlist + +# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild +# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then: +cd kscreensaver/kxsconfig/ +./update_hacks.sh %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -650,12 +684,19 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ %{!?with_libart}:-DWITH_LIBART=OFF} \ -DWITH_OPENGL=ON \ @@ -671,40 +712,24 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install -C build DESTDIR=%{buildroot} -# webcollage -root -directory /usr/share/backgrounds/images #227683 - -# File lists -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -# Duplicate with trinity-kbabel (from tdesdk) -%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png -%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png - # Should not be here if xscreensaver is disabled %if 0%{?with_xscreensaver} == 0 %__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage %__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage-file %endif +# Duplicate with trinity-kbabel (from tdesdk) +%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png +%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png + %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdebase/pamd.kcheckpass-trinity.fc19 b/redhat/tdebase/pamd.kcheckpass-trinity.fc19 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/tdebase/pamd.kcheckpass-trinity.fc19 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/tdebase/pamd.kdm-trinity-np.fc19 b/redhat/tdebase/pamd.kdm-trinity-np.fc19 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/tdebase/pamd.kdm-trinity-np.fc19 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/tdebase/pamd.kdm-trinity.fc19 b/redhat/tdebase/pamd.kdm-trinity.fc19 new file mode 100644 index 000000000..686433fce --- /dev/null +++ b/redhat/tdebase/pamd.kdm-trinity.fc19 @@ -0,0 +1,19 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +session include postlogin diff --git a/redhat/tdebase/pamd.kscreensaver-trinity.fc19 b/redhat/tdebase/pamd.kscreensaver-trinity.fc19 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/tdebase/pamd.kscreensaver-trinity.fc19 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch new file mode 100644 index 000000000..1ed19d685 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-fix_halbackend_slash.patch @@ -0,0 +1,13 @@ +--- trinity-tdebase-3.5.13.2/kioslave/media/mediamanager/halbackend.cpp.slash 2013-08-15 18:24:06.092882626 +0200 ++++ trinity-tdebase-3.5.13.2/kioslave/media/mediamanager/halbackend.cpp 2013-08-15 18:32:20.535855050 +0200 +@@ -554,6 +554,10 @@ + media_name.replace(pattern, i18n(pattern.utf8())); + medium->setLabel(media_name); + } else { ++ // If media_name begins with '%', it is likely to be a directory path. ++ if( media_name.at(0) == '%') { ++ media_name.replace(QChar('%'), "/"); ++ } + medium->setLabel(i18n(media_name.utf8())); + } + diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index d67aa015d..82eca290c 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-tdebase Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Trinity Base Programs Group: User Interface/Desktops @@ -70,7 +70,7 @@ Source7: tdm.service%{?dist} %endif # Fedora 17: special selinux policy required -%if 0%{?fedora} == 17 || 0%{?rhel} == 6 +%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 %define with_selinux_policy 1 Source8: tdm%{?dist}.pp %endif @@ -92,6 +92,8 @@ Patch3: tdebase-3.5.13.2-displayconfig_translation.patch Patch4: tdebase-3.5.13.2-kickoff_default_favs.patch ## [tdebase] Changes konsole default word separator Patch5: tdebase-14.0.0-konsole_wordseps.patch +## [tdebase] Fix '%' caracter in hal volumes +Patch6: tdebase-3.5.13.2-fix_halbackend_slash.patch # Permanent patches, this TDE version only ## [tdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE) @@ -109,9 +111,6 @@ Patch104: tdebase-3.5.13.2-kickoff_xdg_dirs.patch Patch105: tdebase-3.5.13.2-suspend_unmount.patch Patch106: tdebase-3.5.13.2-bookmark_global_copy.patch -# Experimental patches -Patch201: tdebase-3.5.13.2-kcm_xcursor_applytheme.patch - ### Specific patches for RHEL4 (should not go upstream) ## [tdebase] Fix build on RHEL4, detect old libraries without pkg file @@ -174,6 +173,19 @@ Requires: fedora-release-notes %define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html %endif +# Fedora 19 Theme: "Schroedinger's cat" +%if 0%{?fedora} == 19 +Requires: schroedinger-cat-backgrounds-base +%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png + +Requires: fedora-release-notes +%define tde_aboutlabel Fedora 19 +%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html +%endif + + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -304,9 +316,9 @@ Requires: opensuse-manuals_en %endif BuildRequires: cmake >= 2.8 -BuildRequires: qt%{?_qt_suffix}-devel +BuildRequires: qt%{?_qt_suffix}-devel >= 3.3.8.d BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: make @@ -427,8 +439,8 @@ BuildRequires: nas-devel BuildRequires: dbus-devel >= 0.22-12.EL.9p1 Requires: dbus-qt >= 0.22-12.EL.9p1 %else -BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} -Requires: trinity-dbus-tqt >= %{tde_version} +BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 +Requires: trinity-dbus-tqt >= 1:0.63 %endif %if 0%{?fedora} >= 17 @@ -546,10 +558,10 @@ Requires: trinity-libkonq = %{version}-%{release} Requires: %{name}-libtqt3-integration = %{version}-%{release} Requires: %{name}-tdeio-smb-plugin = %{version}-%{release} +Requires: qt%{?_qt_suffix} Requires: trinity-tqtinterface >= %{tde_version} -Requires: trinity-arts >= %{tde_version} +Requires: trinity-arts >= 1:1.5.10 Requires: trinity-tdelibs >= %{tde_version} -Requires: qt%{?_qt_suffix} Requires: openssl @@ -586,7 +598,9 @@ web browser, X terminal emulator, and many other programs and components. Summary: %{summary} - Development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel +Requires: trinity-tqtinterface-devel >= %{tde_version} +Requires: trinity-arts-devel >= 1:1.5.10 +Requires: trinity-tdelibs-devel >= %{tde_version} Requires: %{name}-bin-devel = %{version}-%{release} Requires: trinity-kate-devel = %{version}-%{release} @@ -790,7 +804,7 @@ Some random features: %{tde_tdeappdir}/kate.desktop %{tde_datadir}/apps/kate/ %{tde_datadir}/apps/kconf_update/kate-2.4.upd -%{_sysconfdir}/trinity/katerc +%config(noreplace) %{_sysconfdir}/trinity/katerc %{tde_datadir}/icons/hicolor/*/apps/kate.png %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz %{tde_datadir}/servicetypes/kateplugin.desktop @@ -1193,7 +1207,6 @@ TDE applications, particularly those in the TDE base module. %files bin %defattr(-,root,root,-) %{tde_bindir}/krootbacking -#%{tde_bindir}/tdeinit_phase1 %if 0%{?with_tsak} %attr(4511,root,root) %{tde_bindir}/kdmtsak %{tde_bindir}/tsak @@ -1202,7 +1215,7 @@ TDE applications, particularly those in the TDE base module. %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig %{tde_bindir}/kstart -%{_sysconfdir}/trinity/kxkb_groups +%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups %{tde_bindir}/drkonqi %{tde_bindir}/crashtest %{tde_bindir}/kapplymousetheme @@ -1265,8 +1278,8 @@ TDE applications, particularly those in the TDE base module. %{tde_datadir}/services/kded/khotkeys.desktop %{tde_datadir}/services/kxkb.desktop %if 0%{?suse_version} == 0 -%{_sysconfdir}/pam.d/kcheckpass-trinity -%{_sysconfdir}/pam.d/kscreensaver-trinity +%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity +%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity %endif %{tde_tdedocdir}/HTML/en/kdcop/ %{tde_tdedocdir}/HTML/en/kdebugdialog// @@ -1322,7 +1335,7 @@ needed for a basic TDE desktop installation. %files data %defattr(-,root,root,-) -%{_sysconfdir}/trinity/kshorturifilterrc +%config(noreplace) %{_sysconfdir}/trinity/kshorturifilterrc %{tde_datadir}/applnk/.hidden/battery.desktop %{tde_datadir}/applnk/.hidden/bwarning.desktop %{tde_datadir}/applnk/.hidden/cwarning.desktop @@ -1579,10 +1592,10 @@ needed for a basic TDE desktop installation. %{tde_datadir}/wallpapers/* # XDG directories information -%{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu -%{_sysconfdir}/xdg/menus/tde-information.menu -%{_sysconfdir}/xdg/menus/tde-screensavers.menu -%{_sysconfdir}/xdg/menus/tde-settings.menu +%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu +%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu +%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu +%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu %{tde_tdedocdir}/HTML/en/kcontrol/ %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ @@ -1917,8 +1930,8 @@ the TDE desktop. %files -n trinity-kdesktop %defattr(-,root,root,-) -%{_sysconfdir}/trinity/kdesktop_custom_menu1 -%{_sysconfdir}/trinity/kdesktop_custom_menu2 +%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1 +%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2 %{tde_bindir}/kcheckrunning %{tde_bindir}/kxdglauncher %{tde_bindir}/kdeeject @@ -2035,11 +2048,12 @@ already. Most users won't need this. %{tde_datadir}/apps/kdm/sessions/*.desktop %{tde_datadir}/apps/kdm/themes/ %{tde_datadir}/config/kdm -%{_sysconfdir}/trinity/kdm/ +%dir %{_sysconfdir}/trinity/kdm +%config(noreplace) %{_sysconfdir}/trinity/kdm/* %{tde_tdedocdir}/HTML/en/kdm/ %if 0%{?suse_version} == 0 -%{_sysconfdir}/pam.d/kdm-trinity -%{_sysconfdir}/pam.d/kdm-trinity-np +%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity +%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np %endif %if 0%{?suse_version} /usr/lib/X11/displaymanagers/tdm @@ -2088,11 +2102,17 @@ fi %if 0%{?with_selinux_policy} /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/kdm/tdm.pp" %endif -# Default user icon in TDM +# Sets default user icon in TDM if [ ! -r "%{tde_datadir}/apps/kdm/faces/.default.face.icon" ]; then [ -d "%{tde_datadir}/apps/kdm/faces" ] || mkdir -p "%{tde_datadir}/apps/kdm/faces" %__cp -f "%{tde_datadir}/apps/kdm/pics/users/default2.png" "%{tde_datadir}/apps/kdm/faces/.default.face.icon" fi +# Sets default language for TDM +if [ "$1" = "1" ]; then + if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then + %__sed -i "%{_sysconfdir}/trinity/kdm/kdmrc" -e "s|^#*Language=.*|Language=${LANG}|" + fi +fi %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/kdm' @@ -2166,7 +2186,7 @@ Requires: %{name}-data = %{version}-%{release} Requires: htdig %description -n trinity-khelpcenter -The TDE Help Center provides documentation on how to use the KDE desktop. +The TDE Help Center provides documentation on how to use the TDE desktop. The htdig package is needed to build a searchable archive of TDE documentation. @@ -2390,7 +2410,7 @@ web browser if the clipboard contains a URL. %files -n trinity-klipper %defattr(-,root,root,-) %{tde_bindir}/klipper -%{_sysconfdir}/trinity/klipperrc +%config(noreplace) %{_sysconfdir}/trinity/klipperrc %{tde_tdelibdir}/klipper.la %{tde_tdelibdir}/klipper.so %{tde_tdelibdir}/klipper_panelapplet.la @@ -2431,7 +2451,7 @@ Group: Applications/Utilities Requires: %{name}-data = %{version}-%{release} %description -n trinity-kmenuedit -The TDE menu editor allows you to make customisations to the KDE menu +The TDE menu editor allows you to make customisations to the TDE menu structure. %files -n trinity-kmenuedit @@ -2599,11 +2619,13 @@ for f in crystalsvg hicolor ; do gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : done /sbin/ldconfig || : -update-alternatives --install \ - %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_konqueror \ - %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \ - 10 || : +if [ $1 -eq 1 ]; then + update-alternatives --install \ + %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ + media_safelyremove.desktop_konqueror \ + %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \ + 10 || : +fi %postun -n trinity-konqueror update-desktop-database %{tde_appdir} 2> /dev/null || : @@ -2818,7 +2840,7 @@ Requires: trinity-twin = %{version}-%{release} %description -n trinity-ksmserver This package contains the TDE session manager. It is responsible for restoring your TDE session on login. It is also needed to properly -start a TDE session. It registers KDE with X display managers, and +start a TDE session. It registers TDE with X display managers, and provides the 'starttde' command, for starting an X session with TDE from the console. @@ -3019,7 +3041,7 @@ ktip provides many useful tips on using TDE when you log in. %{tde_tdeappdir}/ktip.desktop %{tde_datadir}/applnk/Toys/ktip.desktop %{tde_datadir}/apps/kdewizard/pics/wizard_small.png -%{tde_datadir}/apps/kdewizard/tips/ +%{tde_datadir}/apps/kdewizard/tips %{tde_datadir}/autostart/ktip.desktop %{tde_datadir}/icons/hicolor/*/apps/ktip.* @@ -3254,6 +3276,7 @@ Windows and Samba shares. %patch3 -p1 -b .displayconfigtranslation %patch4 -p1 -b .kickoffdefaultsfav %patch5 -p1 -b .konsolewordseps +%patch6 -p1 -b .halbackend %patch11 -p1 -b .tdmpid %patch12 -p1 -b .kdesunoignorebutton @@ -3266,8 +3289,6 @@ Windows and Samba shares. %patch105 -p1 -b .suspend_unmount %patch106 -p1 -b .bookmark_global_copy -%patch201 -p1 -b .kcmxcursor - %if 0%{?rhel} == 4 %patch301 -p1 -b .libdetect @@ -3321,9 +3342,7 @@ Windows and Samba shares. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # Avoids building against KDE3's old stuff, if installed export KDEDIR=%{tde_prefix} @@ -3346,19 +3365,20 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DCONFIG_INSTALL_DIR="/etc/trinity" \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ - -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ -DWITH_SASL=ON \ -DWITH_LDAP=ON \ @@ -3392,8 +3412,8 @@ cd build -DKSCREENSAVER_PAM_SERVICE="xdm" \ %else -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ - -DKDM_PAM_SERVICE="kdm-trinity" \ - -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \ + -DKDM_PAM_SERVICE="tdm-trinity" \ + -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ %endif %{!?with_tsak:-DBUILD_TSAK=OFF} \ .. @@ -3452,13 +3472,13 @@ EOF # PAM configuration files (except openSUSE) %if 0%{?suse_version} == 0 -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity" -%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" +%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" -%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" +%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" %endif -# KDM configuration +# TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \ %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" @@ -3503,7 +3523,7 @@ EOF # Mageia icon %if 0%{?mgaversion} >= 3 -%__install -D -m 644 %{SOURCE9} %{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg +%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg" %endif @@ -3512,6 +3532,9 @@ EOF %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option - Fix XDG menu diff --git a/redhat/tdebase/tdm.fc19.pp b/redhat/tdebase/tdm.fc19.pp Binary files differnew file mode 100644 index 000000000..dec162d22 --- /dev/null +++ b/redhat/tdebase/tdm.fc19.pp diff --git a/redhat/tdebase/tdm.service.fc19 b/redhat/tdebase/tdm.service.fc19 new file mode 100644 index 000000000..eb35da9e5 --- /dev/null +++ b/redhat/tdebase/tdm.service.fc19 @@ -0,0 +1,13 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service +Conflicts=plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby_path.patch b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby_path.patch new file mode 100644 index 000000000..924e2240c --- /dev/null +++ b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby_path.patch @@ -0,0 +1,32 @@ +--- trinity-tdebindings-3.5.13.2/qtruby/rubylib/qtruby/configure.in.in.ORI 2013-08-17 10:49:32.741192663 +0200 ++++ trinity-tdebindings-3.5.13.2/qtruby/rubylib/qtruby/configure.in.in 2013-08-17 10:52:27.904466644 +0200 +@@ -54,6 +54,13 @@ + RUBY_INCLUDEDIR=$RUBY_ARCHDIR + RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` + fi ++ ++ # Removes trailing slashes, if any, to avoid fail to install with recent libtool. ++ RUBY_ARCHDIR=${RUBY_ARCHDIR%/} ++ RUBY_SITEDIR=${RUBY_SITEDIR%/} ++ RUBY_LIBDIR=${RUBY_LIBDIR%/} ++ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} ++ + AC_MSG_RESULT([ + archdir $RUBY_ARCHDIR, + sitearchdir $RUBY_SITEARCHDIR, +--- trinity-tdebindings-3.5.13.2/korundum/rubylib/korundum/configure.in.in.ORI 2013-08-17 10:58:23.873872686 +0200 ++++ trinity-tdebindings-3.5.13.2/korundum/rubylib/korundum/configure.in.in 2013-08-17 10:58:44.416433828 +0200 +@@ -54,6 +54,13 @@ + RUBY_INCLUDEDIR=$RUBY_ARCHDIR + RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` + fi ++ ++ # Removes trailing slashes, if any, to avoid fail to install with recent libtool. ++ RUBY_ARCHDIR=${RUBY_ARCHDIR%/} ++ RUBY_SITEDIR=${RUBY_SITEDIR%/} ++ RUBY_LIBDIR=${RUBY_LIBDIR%/} ++ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} ++ + AC_MSG_RESULT([ + archdir $RUBY_ARCHDIR, + sitearchdir $RUBY_SITEARCHDIR, diff --git a/redhat/tdebindings/tdebindings-3.5.13.2.spec b/redhat/tdebindings/tdebindings-3.5.13.2.spec index da5536070..d862c9b15 100644 --- a/redhat/tdebindings/tdebindings-3.5.13.2.spec +++ b/redhat/tdebindings/tdebindings-3.5.13.2.spec @@ -5,12 +5,14 @@ # or 64 bits: # ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so +%define tde_version 3.5.13.2 + # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -34,8 +36,8 @@ Source91: filter-requires.sh Name: trinity-tdebindings Summary: TDE bindings to non-C++ languages -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: User Interface/Desktops @@ -49,6 +51,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +# [tdebindings] Fix RUBY path ending with '/' causing fail to install +Patch1: tdebindings-3.5.13.2-fix_ruby_path.patch + # [kdebindings] Fix FTBFS in dcopjava/bindings Patch7: kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch @@ -56,9 +61,9 @@ Patch7: kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch Patch18: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: zlib-devel @@ -106,7 +111,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 @@ -121,8 +127,18 @@ BuildRequires: python-devel ## ruby BuildRequires: ruby-devel >= 1.8, ruby +%if "%{?ruby_libarchdir}" != "" +%define ruby_arch %{?ruby_libarchdir} +%else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} +%endif + +%if "%{?ruby_libdir}" != "" +%define ruby_rubylibdir %{?ruby_libdir} +%else %{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} +%endif + # Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') @@ -926,7 +942,8 @@ 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} @@ -957,6 +974,7 @@ Development files for the TDE bindings. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .rubypath %patch7 -p1 -b .dcopjavaldflags %if "%{?perl_vendorarch}" == "" @@ -968,7 +986,7 @@ exit 1 %endif # Workarounds strange issue in MGA3 -%if 0%{?mgaversion} == 3 || 0%{?pclinuxos} >= 2013 +%if 0%{?mgaversion} == 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19 %__cp /usr/share/automake-1.13/test-driver admin/ %endif @@ -976,12 +994,6 @@ exit 1 %__sed -i "xparts/Makefile.am" \ -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1016,25 +1028,27 @@ fi --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-debug --disable-warnings \ + \ --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ + --with-extra-includes=%{_includedir}/tqscintilla \ --with-extra-libs=%{tde_libdir} \ --with-pythondir=%{_usr} \ - --enable-closure \ - --enable-final \ + \ %{?_with_java} %{!?_with_java:--without-java} \ - %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ - --with-extra-includes=%{tde_includedir}/tqt + %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} +# Build dcopperl with specific options pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor -# Ugly hack to add TQT include directory in Makefile -# Also modifies the man pages directory +# Ugly hack to modify the man pages directory sed -i Makefile \ - -e "s|^\(INC = .*\)|\1 -I%{tde_includedir}/tqt|" \ -e "s|/usr/share/man|%{tde_mandir}|g" %__make OPTIMIZE="$RPM_OPT_FLAGS" ||: @@ -1058,24 +1072,6 @@ export PATH="%{tde_bindir}:${PATH}" find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -# locale's -%find_lang %{name} || touch %{name}.lang -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then -for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common - done - popd - fi -done -fi - # Installs juic %__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common @@ -1108,5 +1104,8 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeedu/tdeedu-3.5.13.2.spec b/redhat/tdeedu/tdeedu-3.5.13.2.spec index 91f081362..3c9a88fce 100644 --- a/redhat/tdeedu/tdeedu-3.5.13.2.spec +++ b/redhat/tdeedu/tdeedu-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -19,8 +21,8 @@ Name: trinity-tdeedu Summary: Educational/Edutainment applications -Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: Amusements/Games @@ -36,7 +38,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils -BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: python-devel python BuildRequires: boost-devel %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 @@ -1110,9 +1112,9 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-libtdeedu3 %defattr(-,root,root,-) %{tde_libdir}/libextdate.so.* -%{tde_libdir}/lib[kt]deeducore.so.* -%{tde_libdir}/lib[kt]deeduplot.so.* -%{tde_libdir}/lib[kt]deeduui.so.* +%{tde_libdir}/libkdeeducore.so.* +%{tde_libdir}/libkdeeduplot.so.* +%{tde_libdir}/libkdeeduui.so.* %post -n trinity-libtdeedu3 /sbin/ldconfig || : @@ -1138,15 +1140,15 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-libtdeedu-devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/lib[kt]deedu/ +%{tde_tdeincludedir}/libkdeedu/ %{tde_libdir}/libextdate.la %{tde_libdir}/libextdate.so -%{tde_libdir}/lib[kt]deeducore.la -%{tde_libdir}/lib[kt]deeducore.so -%{tde_libdir}/lib[kt]deeduui.la -%{tde_libdir}/lib[kt]deeduui.so -%{tde_libdir}/lib[kt]deeduplot.la -%{tde_libdir}/lib[kt]deeduplot.so +%{tde_libdir}/libkdeeducore.la +%{tde_libdir}/libkdeeducore.so +%{tde_libdir}/libkdeeduui.la +%{tde_libdir}/libkdeeduui.so +%{tde_libdir}/libkdeeduplot.la +%{tde_libdir}/libkdeeduplot.so %post -n trinity-libtdeedu-devel /sbin/ldconfig || : @@ -1311,12 +1313,6 @@ Provides: trinity-kdeedu-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1337,26 +1333,26 @@ if [ -d "/usr/X11R6" ]; then fi %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} --enable-kig-python-scripting \ %else --disable-kig-python-scripting \ %endif - --disable-debug \ - --disable-warnings \ - --enable-final \ - --enable-closure \ - --enable-ocamlsolver \ - --with-extra-includes=%{tde_includedir}/tqt + --enable-ocamlsolver %__make %{_smp_mflags} \ OCAMLLIB=$(ocamlc -where) \ @@ -1368,28 +1364,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# locale's -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common - done - popd - fi -done -fi - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdegames/tdegames-3.5.13.2.spec b/redhat/tdegames/tdegames-3.5.13.2.spec index d65c2f7d5..a362c1407 100644 --- a/redhat/tdegames/tdegames-3.5.13.2.spec +++ b/redhat/tdegames/tdegames-3.5.13.2.spec @@ -23,7 +23,7 @@ Name: trinity-tdegames Summary: Trinity Desktop Environment - Games Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: Amusements/Games @@ -40,11 +40,11 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: libtool -BuildRequires: tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: qt3-devel >= 3.3.8.d +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} -BuildRequires: qt3-devel >= 3.3.8.d Obsoletes: trinity-kdegames < %{version}-%{release} Provides: trinity-kdegames = %{version}-%{release} @@ -103,7 +103,7 @@ Group: Development/Libraries License: LGPLv2 Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= 3.5.13 +Requires: trinity-tdelibs-devel >= %{tde_version} Requires: trinity-libtdegames-devel = %{version}-%{release} Requires: trinity-atlantik-devel = %{version}-%{release} Requires: trinity-kolf-devel = %{version}-%{release} @@ -136,8 +136,8 @@ This package is part of TDE, and a component of the TDE games module. %files -n trinity-libtdegames1 %defattr(-,root,root,-) -%{tde_libdir}/lib[kt]degames.so.* -%{tde_datadir}/apps/[kt]degames/pics/star.png +%{tde_libdir}/libkdegames.so.* +%{tde_datadir}/apps/kdegames/pics/star.png %{tde_datadir}/icons/crystalsvg/*/actions/roll.png %{tde_datadir}/icons/crystalsvg/*/actions/highscore.png #%{tde_tdedocdir}/HTML/en/%{name}-%{version}-apidocs/ @@ -173,8 +173,8 @@ This package is part of Trinity, and a component of the TDE games module. %defattr(-,root,root,-) %{tde_tdeincludedir}/*.h %{tde_tdeincludedir}/kgame -%{tde_libdir}/lib[kt]degames.so -%{tde_libdir}/lib[kt]degames.la +%{tde_libdir}/libkdegames.so +%{tde_libdir}/libkdegames.la ########## @@ -876,8 +876,8 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/kolf.png %{tde_datadir}/mimelnk/application/x-kolf.desktop %{tde_datadir}/mimelnk/application/x-kourse.desktop -%{tde_libdir}/lib[kt]deinit_kolf.so -%{tde_libdir}/lib[kt]deinit_kolf.la +%{tde_libdir}/libkdeinit_kolf.so +%{tde_libdir}/libkdeinit_kolf.la %{tde_tdelibdir}/kolf.la %{tde_tdelibdir}/kolf.so %{tde_libdir}/libkolf.so.1 @@ -1448,13 +1448,13 @@ This package is part of Trinity, and a component of the TDE games module. %files -n trinity-twin4 %defattr(-,root,root,-) -%{tde_bindir}/[kt]win4 -%{tde_bindir}/[kt]win4proc -%{tde_datadir}/apps/[kt]win4/ -%{tde_datadir}/config.kcfg/[kt]win4.kcfg -%{tde_datadir}/icons/hicolor/*/apps/[kt]win4.png -%{tde_tdeappdir}/[kt]win4.desktop -%{tde_tdedocdir}/HTML/en/[kt]win4/ +%{tde_bindir}/kwin4 +%{tde_bindir}/kwin4proc +%{tde_datadir}/apps/kwin4/ +%{tde_datadir}/config.kcfg/kwin4.kcfg +%{tde_datadir}/icons/hicolor/*/apps/kwin4.png +%{tde_tdeappdir}/kwin4.desktop +%{tde_tdedocdir}/HTML/en/kwin4/ %post -n trinity-twin4 for f in hicolor ; do @@ -1523,12 +1523,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1537,7 +1531,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Do not build against any "/usr" installed KDE export KDEDIR="%{tde_prefix}" @@ -1560,9 +1553,7 @@ fi --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath \ \ --disable-setgid @@ -1586,6 +1577,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec index cd6a53ad2..f00f79290 100644 --- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec +++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec @@ -22,7 +22,7 @@ Name: trinity-tdegraphics Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Trinity Desktop Environment - Graphics Applications @@ -188,6 +188,7 @@ BuildRequires: lcms-devel BuildRequires: libart_lgpl-devel # kuickshow +#define build_kuickshow 1 BuildRequires: fribidi-devel # kamera @@ -195,6 +196,11 @@ BuildRequires: fribidi-devel %define build_kamera 1 %endif +# kmrml +#define build_kmrml 1 +#Requires: gift +Obsoletes: trinity-kmrml + Obsoletes: trinity-kdegraphics < %{version}-%{release} Provides: trinity-kdegraphics = %{version}-%{release} Obsoletes: trinity-kdegraphics-libs < %{version}-%{release} @@ -212,7 +218,7 @@ Requires: trinity-kfaxview = %{version}-%{release} Requires: trinity-kgamma = %{version}-%{release} Requires: trinity-kghostview = %{version}-%{release} Requires: trinity-kiconedit = %{version}-%{release} -Requires: trinity-kmrml = %{version}-%{release} +%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}} Requires: trinity-kolourpaint = %{version}-%{release} Requires: trinity-kooka = %{version}-%{release} Requires: trinity-kpdf = %{version}-%{release} @@ -244,6 +250,8 @@ Graphics applications for the Trinity Desktop Environment, including * kview (image viewer for GIF, JPEG, TIFF, etc.) %files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog README ########## @@ -441,7 +449,6 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %files -n trinity-kfax %defattr(-,root,root,-) -%doc rpmdocs/kfax/ %{tde_bindir}/kfax %{tde_tdeappdir}/kfax.desktop %{tde_datadir}/apps/kfax/ @@ -619,6 +626,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## +%if 0%{?build_kmrml} + %package -n trinity-kmrml Summary: A Konqueror plugin for searching pictures Group: Applications/Graphics @@ -642,7 +651,7 @@ MRML server. %{tde_tdelibdir}/libkmrmlpart.so %{tde_tdelibdir}/mrmlsearch.la %{tde_tdelibdir}/mrmlsearch.so -%{tde_libdir}/lib[kt]deinit_mrmlsearch.so +%{tde_libdir}/libkdeinit_mrmlsearch.so %{tde_tdeappdir}/kcmkmrml.desktop %{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop %{tde_datadir}/mimelnk/text/mrml.desktop @@ -658,6 +667,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : /sbin/ldconfig || : +%endif + ########## %package -n trinity-kolourpaint @@ -801,7 +812,6 @@ Homepage: http://www.kpovmodeler.org %files -n trinity-kpovmodeler %defattr(-,root,root,-) -%doc rpmdocs/kpovmodeler/ %{tde_bindir}/kpovmodeler %{tde_libdir}/libkpovmodeler.so.* %{tde_tdelibdir}/libkpovmodelerpart.* @@ -967,7 +977,7 @@ as well. %{tde_tdelibdir}/libkviewcanvas.so %{tde_tdelibdir}/libkviewviewer.la %{tde_tdelibdir}/libkviewviewer.so -%{tde_libdir}/lib[kt]deinit_kview.so +%{tde_libdir}/libkdeinit_kview.so %{tde_libdir}/libkimageviewer.so.* %{tde_tdelibdir}/libphotobook.la %{tde_tdelibdir}/libphotobook.so @@ -1183,8 +1193,10 @@ 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}/libkdeinit_kview.la +%if 0%{?build_kmrml} +%{tde_libdir}/libkdeinit_mrmlsearch.la +%endif %{tde_libdir}/libkghostviewlib.la %{tde_libdir}/libkghostviewlib.so %{tde_libdir}/libkimageviewer.la @@ -1215,8 +1227,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}/libkdeinit_kuickshow.la +#%exclude %{tde_libdir}/libkdeinit_kuickshow.so #%exclude %{tde_tdeappdir}/kuickshow.desktop #%exclude %{tde_datadir}/apps/kuickshow/ #%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png @@ -1249,7 +1261,6 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release} unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" # Do not build against any "/usr" installed KDE export KDEDIR=%{tde_prefix} @@ -1265,10 +1276,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ @@ -1285,6 +1297,7 @@ cd build -DWITH_PDF=ON \ -DBUILD_ALL=ON \ -DBUILD_KUICKSHOW=OFF \ + %{!?build_kmrml:-DBUILD_KMRML=OFF} \ %{!?build_kamera:-DBUILD_KAMERA=OFF} \ .. @@ -1296,15 +1309,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# rpmdocs -for dir in k* ; do - for file in AUTHORS ChangeLog README TODO ; do - if test -s "$dir/$file" ; then - install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" - echo "%doc rpmdocs/$dir/" >> %{name}.lang - fi - done -done %clean @@ -1312,6 +1316,9 @@ done %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec index 4fe30cdb5..1bc70e518 100644 --- a/redhat/tdelibs/tdelibs-3.5.13.2.spec +++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec @@ -18,41 +18,42 @@ %define _docdir %{tde_docdir} -Name: trinity-tdelibs -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPL -Summary: TDE Libraries -Group: Environment/Libraries +Name: trinity-tdelibs +Version: %{tde_version} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: Environment/Libraries -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz # Fix categories in T-menu -Patch1: tdelibs-3.5.13.2-fix_xdg_menu.patch +Patch1: tdelibs-3.5.13.2-fix_xdg_menu.patch # Patches from Mandriva Patch101: tdelibs-3.5.13.2-xdg_dirs_set_path.patch Patch102: tdelibs-3.5.13.2-cups_by_default.patch -Obsoletes: tdelibs < %{version}-%{release} -Provides: tdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs < %{version}-%{release} -Provides: trinity-kdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} -Provides: trinity-kdelibs-apidocs = %{version}-%{release} +Obsoletes: tdelibs < %{version}-%{release} +Provides: tdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs < %{version}-%{release} +Provides: trinity-kdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} +Provides: trinity-kdelibs-apidocs = %{version}-%{release} BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: qt3-devel >= 3.3.8.d BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: krb5-devel BuildRequires: libxslt-devel BuildRequires: cups-devel @@ -131,7 +132,7 @@ BuildRequires: jasper-devel # AVAHI support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_avahi 1 -BuildRequires: trinity-avahi-tqt-devel >= %{tde_version} +BuildRequires: trinity-avahi-tqt-devel >= 1:0.6.30 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}avahi-client-devel Requires: %{_lib}avahi-client3 @@ -209,13 +210,13 @@ Requires: openssl # Trinity dependencies Requires: qt3 >= 3.3.8.d Requires: trinity-tqtinterface >= %{tde_version} -Requires: trinity-arts >= %{tde_version} +Requires: trinity-arts >= 1:1.5.10 %description Libraries for the Trinity Desktop Environment: TDE Libraries included: tdecore (TDE core library), kdeui (user interface), -kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kfm (file manager), khtmlw (HTML widget), tdeio (Input/Output, networking), kspell (spelling checker), jscript (javascript), kab (addressbook), kimgio (image manipulation). @@ -306,7 +307,6 @@ kimgio (image manipulation). %{tde_tdedocdir}/HTML/en/kspell/ %{_sysconfdir}/xdg/menus/tde-applications.menu -%{_sysconfdir}/ld.so.conf.d/trinity.conf %pre # TDE Bug #1074 @@ -393,10 +393,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ @@ -436,13 +437,6 @@ cd build %__rm -rf "%{?buildroot}" %__make install DESTDIR="%{?buildroot}" -C build -%if "%{?tde_prefix}" != "/usr" -%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d" -cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf" -%{tde_libdir} -EOF -%endif - # Use system-wide CA certificate %if "%{?cacert}" != "" %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" @@ -455,6 +449,9 @@ EOF %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option - Fix XDG menu diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec index 17bd92fc2..89c8d9e6f 100644 --- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec @@ -28,7 +28,7 @@ Name: trinity-tdemultimedia Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: Applications/Multimedia @@ -57,7 +57,7 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} BuildRequires: autoconf automake libtool m4 BuildRequires: qt3-devel >= 3.3.8.d BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} %if "%{?_with_akode}" != "" @@ -1068,7 +1068,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : Summary: Development files for %{name}, aRts and noatun plugins Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= 3.5.13 +Requires: trinity-tdelibs-devel >= %{tde_version} Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release} Provides: trinity-kdemultimedia-devel = %{version}-%{release} @@ -1142,12 +1142,6 @@ noatun plugins. %patch0 -p1 -b .ftbfs %patch1 -p1 -b .xdgmenu -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1156,7 +1150,6 @@ noatun plugins. %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # Required for some distro @@ -1180,9 +1173,9 @@ fi --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ + --enable-rpath \ \ - --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ + --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ \ --with-cdparanoia \ --with-flac \ @@ -1213,6 +1206,9 @@ chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/* %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 - Rebuild with NDEBUG option - Fix XDG menu diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec index 29685ae2a..71abbb12e 100644 --- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec +++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec @@ -35,7 +35,7 @@ Name: trinity-tdenetwork Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} Summary: Trinity Desktop Environment - Network Applications Vendor: Trinity Project @@ -67,16 +67,18 @@ Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch BuildRequires: cmake >= 2.8 BuildRequires: gettext -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: coreutils BuildRequires: openssl-devel +BuildRequires: gnutls-devel + +# SQLITE support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: sqlite3-devel %else BuildRequires: sqlite-devel %endif -BuildRequires: gnutls-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -1082,8 +1084,6 @@ update-desktop-database 2> /dev/null || : unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -1096,10 +1096,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ @@ -1161,6 +1162,9 @@ EOF %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option - Disable 'lisa' service diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec index 57ab87fd2..7b58e1c29 100644 --- a/redhat/tdepim/tdepim-3.5.13.2.spec +++ b/redhat/tdepim/tdepim-3.5.13.2.spec @@ -31,7 +31,7 @@ BuildRequires: gnokii-devel Name: trinity-tdepim Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPL Group: Applications/Productivity @@ -49,7 +49,7 @@ Patch14: kdepim-3.5.13-missing_ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-libcaldav-devel BuildRequires: trinity-libcarddav-devel @@ -62,7 +62,8 @@ BuildRequires: libical-devel BuildRequires: boost-devel BuildRequires: pcre-devel BuildRequires: glib2-devel -BuildRequires: gcc-c++ make +BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: libidn-devel # CURL support @@ -2199,8 +2200,6 @@ fi unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 if [ -d "/usr/X11R6" ]; then @@ -2213,10 +2212,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ @@ -2249,6 +2249,7 @@ cd build %__make %{?_smp_mflags} || %__make + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{?buildroot} @@ -2260,6 +2261,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/tdesdk/tdesdk-3.5.13.2-fix_cervisia_pod.patch b/redhat/tdesdk/tdesdk-3.5.13.2-fix_cervisia_pod.patch new file mode 100644 index 000000000..7785acb17 --- /dev/null +++ b/redhat/tdesdk/tdesdk-3.5.13.2-fix_cervisia_pod.patch @@ -0,0 +1,11 @@ +--- trinity-tdesdk-3.5.13.2/cervisia/cervisia.pod 2013-06-07 19:36:41.000000000 +0200 ++++ trinity-tdesdk-3.5.13.2/cervisia/cervisia.pod.new 2013-08-17 11:48:28.289517241 +0200 +@@ -84,6 +84,8 @@ + + Sets the geometry of the main window + ++=back ++ + =head1 FILES + + F<_KDECONFDIR_/cervisiarc> - global configuration file diff --git a/redhat/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec index f2c8a9a34..e3261b89f 100644 --- a/redhat/tdesdk/tdesdk-3.5.13.2.spec +++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec @@ -22,7 +22,7 @@ Name: trinity-tdesdk Summary: The Trinity Software Development Kit (SDK) Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: User Interface/Desktops @@ -35,6 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tdesdk-3.5.13.2-fix_cervisia_pod.patch + BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: pcre-devel @@ -135,8 +137,8 @@ This package is part of Trinity, and a component of the TDE SDK module. %files -n trinity-cervisia %{tde_bindir}/cervisia -%{tde_libdir}/lib[kt]deinit_cervisia.la -%{tde_libdir}/lib[kt]deinit_cervisia.so +%{tde_libdir}/libkdeinit_cervisia.la +%{tde_libdir}/libkdeinit_cervisia.so %{tde_tdelibdir}/cervisia.la %{tde_tdelibdir}/cervisia.so %{tde_tdelibdir}/libcervisiapart.la @@ -524,7 +526,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_tdelibdir}/plugins/styles/scheck.la %{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop %{tde_datadir}/apps/kstyle/themes/scheck.themerc -%{tde_datadir}/kdepalettes/ +%{tde_datadir}/kdepalettes %{tde_libdir}/libkstartperf.so.* %{tde_libdir}/libkstartperf.so @@ -599,7 +601,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/svnrevertlast %{tde_bindir}/svnforwardport %{tde_bindir}/nonsvnlist -%{tde_bindir}/[kt]desvn-build +%{tde_bindir}/kdesvn-build %{tde_bindir}/svnlastlog %{tde_bindir}/svnversions %{tde_bindir}/create_svnignore @@ -610,15 +612,15 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/svngettags %{tde_bindir}/svnchangesince %{tde_bindir}/svn-clean -%{tde_datadir}/apps/katepart/syntax/[kt]desvn-buildrc.xml +%{tde_datadir}/apps/katepart/syntax/kdesvn-buildrc.xml %{tde_mandir}/man1/cvsblame.1 %{tde_mandir}/man1/cvscheck.1 %{tde_mandir}/man1/cvsversion.1 %{tde_mandir}/man1/kde-build.1 %{tde_mandir}/man1/includemocs.1 %{tde_mandir}/man1/noncvslist.1 -%{tde_mandir}/man1/[kt]desvn-build.1 -%{tde_tdedocdir}/HTML/en/[kt]desvn-build/ +%{tde_mandir}/man1/kdesvn-build.1 +%{tde_tdedocdir}/HTML/en/kdesvn-build/ #scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts #scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts #scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts @@ -801,8 +803,8 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/cvsaskpass %{tde_bindir}/cvsservice %{tde_libdir}/libcvsservice.so.* -%{tde_libdir}/lib[kt]deinit_cvsaskpass.so -%{tde_libdir}/lib[kt]deinit_cvsservice.so +%{tde_libdir}/libkdeinit_cvsaskpass.so +%{tde_libdir}/libkdeinit_cvsservice.so %{tde_tdelibdir}/cvsaskpass.la %{tde_tdelibdir}/cvsaskpass.so %{tde_tdelibdir}/cvsservice.la @@ -839,8 +841,8 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_tdeincludedir}/repository_stub.h %{tde_libdir}/libcvsservice.la %{tde_libdir}/libcvsservice.so -%{tde_libdir}/lib[kt]deinit_cvsaskpass.la -%{tde_libdir}/lib[kt]deinit_cvsservice.la +%{tde_libdir}/libkdeinit_cvsaskpass.la +%{tde_libdir}/libkdeinit_cvsservice.la %{tde_datadir}/cmake/cervisia.cmake %post -n trinity-libcvsservice-devel @@ -1063,14 +1065,13 @@ Provides: trinity-kdesdk-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - +%patch1 -p1 -b .cervisiapod + %build unset QTDIR || :; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LD_LIBRARY_PATH="%{tde_libdir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -1081,12 +1082,12 @@ fi cd build %endif - %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ @@ -1102,7 +1103,7 @@ cd build %{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install @@ -1111,17 +1112,6 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build -# make symlinks relative -if [ -d %{buildroot}%{tde_tdedocdir}/HTML/en ]; then - pushd %{buildroot}%{tde_tdedocdir}/HTML/en - for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -nfs ../common $i - fi - done - popd -fi # Installs kdepalettes %__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes @@ -1159,12 +1149,11 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option * 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] - diff --git a/redhat/tdetoys/tdetoys-3.5.13.2.spec b/redhat/tdetoys/tdetoys-3.5.13.2.spec index 0ccf022a2..32e3cbc41 100644 --- a/redhat/tdetoys/tdetoys-3.5.13.2.spec +++ b/redhat/tdetoys/tdetoys-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -18,14 +20,14 @@ %define _docdir %{tde_docdir} -Summary: Trinity Desktop Environment - Toys and Amusements -Name: trinity-tdetoys -Group: Amusements/Graphics -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Summary: Trinity Desktop Environment - Toys and Amusements +Name: trinity-tdetoys +Group: Amusements/Graphics +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Source0: %{name}-%{version}.tar.gz +License: GPLv2+ +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -34,10 +36,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: gettext Obsoletes: trinity-kdetoys < %{version}-%{release} @@ -68,7 +71,7 @@ Includes: * kworldwatch: application and kicker applet showing daylight area on the world globe -NOTE: kicker applets and screen savers require kdebase to be installed, +NOTE: kicker applets and screen savers require tdebase to be installed, and user to be logged-in to TDE. %files @@ -85,8 +88,8 @@ Group: Amusements/Graphics AMOR stands for Amusing Misuse Of Resources. It provides several different characters who prance around your X screen doing tricks and giving you tips. -Note that AMOR will only work with some window managers. Both KWin (the -KDE window manager) and Metacity (a GTK2 window manager) are supported. +Note that AMOR will only work with some window managers. Both TWin (the +TDE window manager) and Metacity (a GTK2 window manager) are supported. This package is part of Trinity, and a component of the TDE toys module. @@ -116,7 +119,7 @@ Summary: eyes applet for Trinity Group: Amusements/Graphics %description -n trinity-eyesapplet -An applet for the KDE panel containing a pair of eyes that follow your mouse +An applet for the TDE panel containing a pair of eyes that follow your mouse around the screen. This package is part of Trinity, and a component of the TDE toys module. @@ -135,7 +138,7 @@ Summary: fifteen pieces puzzle for Trinity Group: Amusements/Graphics %description -n trinity-fifteenapplet -An applet for the KDE panel that lets you play the Fifteen Pieces +An applet for the TDE panel that lets you play the Fifteen Pieces sliding block puzzle. You have to order 15 pieces in a 4x4 square by moving them around. @@ -155,7 +158,7 @@ Summary: moon phase indicator for Trinity Group: Amusements/Graphics %description -n trinity-kmoon -An applet for the KDE panel that displays the current phase of the moon. +An applet for the TDE panel that displays the current phase of the moon. This package is part of Trinity, and a component of the TDE toys module. @@ -224,7 +227,7 @@ drink. KTeaTime sits in the Trinity system tray. Please note that KTeaTime is written explicitly for Trinity. If you are -using a non-KDE window manager or desktop environment then it is quite +using a non-TDE window manager or desktop environment then it is quite possible that KTeaTime will not work on your system. This package is part of Trinity, and a component of the TDE toys module. @@ -255,7 +258,7 @@ Summary: Tux screensaver for Trinity Group: Amusements/Graphics %description -n trinity-ktux -A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE). +A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE). This package is part of Trinity, and a component of the TDE toys module. @@ -282,7 +285,7 @@ Summary: weather display applet for Trinity Group: Amusements/Graphics %description -n trinity-kweather -An applet for the KDE panel that displays your area's current weather. +An applet for the TDE panel that displays your area's current weather. Information shown includes the temperature, wind speed, air pressure and more. By pressing a button a full weather report can be obtained. @@ -296,8 +299,8 @@ This package is part of Trinity, and a component of the TDE toys module. %defattr(-,root,root,-) %{tde_bindir}/kweatherservice %{tde_bindir}/kweatherreport -%{tde_libdir}/lib[kt]deinit_kweatherreport.so -%{tde_libdir}/lib[kt]deinit_kweatherreport.la +%{tde_libdir}/libkdeinit_kweatherreport.so +%{tde_libdir}/libkdeinit_kweatherreport.la %{tde_tdelibdir}/kcm_weather.so %{tde_tdelibdir}/kcm_weather.la %{tde_tdelibdir}/kcm_weatherservice.so @@ -375,17 +378,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %build @@ -394,19 +387,29 @@ export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export KDEDIR=%{tde_prefix} -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --enable-new-ldflags \ - --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DDOC_INSTALL_DIR="%{tde_docdir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} @@ -414,28 +417,7 @@ export KDEDIR=%{tde_prefix} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf "%{buildroot}" -%__make install DESTDIR=%{buildroot} - -# replace absolute symlink with relative -ln -nfs tips-en %{buildroot}%{tde_datadir}/apps/amor/tips - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common - done - popd - fi -done -fi +%__make install DESTDIR=%{buildroot} -C build # Useless include file from Amor %__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h @@ -446,6 +428,9 @@ fi %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/tdeutils/tdeutils-3.5.13.2.spec b/redhat/tdeutils/tdeutils-3.5.13.2.spec index e878f2e69..35d023e11 100644 --- a/redhat/tdeutils/tdeutils-3.5.13.2.spec +++ b/redhat/tdeutils/tdeutils-3.5.13.2.spec @@ -22,7 +22,7 @@ Name: trinity-tdeutils Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: TDE Utilities Group: Applications/System @@ -48,9 +48,10 @@ Provides: trinity-kdeutils-extras = %{version}-%{release} Obsoletes: tdeutils < %{version}-%{release} Provides: tdeutils = %{version}-%{release} -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: autoconf automake libtool m4 BuildRequires: gettext BuildRequires: net-snmp-devel @@ -166,7 +167,7 @@ package. %{tde_tdelibdir}/ark.so %{tde_tdelibdir}/libarkpart.la %{tde_tdelibdir}/libarkpart.so -%{tde_libdir}/lib[kt]deinit_ark.so +%{tde_libdir}/libkdeinit_ark.so %{tde_tdeappdir}/ark.desktop %{tde_datadir}/apps/ark/ %{tde_datadir}/config.kcfg/ark.kcfg @@ -211,7 +212,7 @@ It provides: %{tde_bindir}/kcalc %{tde_tdelibdir}/kcalc.la %{tde_tdelibdir}/kcalc.so -%{tde_libdir}/lib[kt]deinit_kcalc.so +%{tde_libdir}/libkdeinit_kcalc.so %{tde_tdeappdir}/kcalc.desktop %{tde_datadir}/apps/kcalc/ %{tde_datadir}/apps/kconf_update/kcalcrc.upd @@ -287,7 +288,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE. %{tde_tdelibdir}/irkick.so %{tde_tdelibdir}/kcm_kcmlirc.la %{tde_tdelibdir}/kcm_kcmlirc.so -%{tde_libdir}/lib[kt]deinit_irkick.so +%{tde_libdir}/libkdeinit_irkick.so %{tde_tdeappdir}/irkick.desktop %{tde_tdeappdir}/kcmlirc.desktop %{tde_datadir}/apps/irkick/ @@ -402,7 +403,7 @@ reasonably fast start. %{tde_bindir}/kedit %{tde_tdelibdir}/kedit.la %{tde_tdelibdir}/kedit.so -%{tde_libdir}/lib[kt]deinit_kedit.so +%{tde_libdir}/libkdeinit_kedit.so %{tde_tdeappdir}/KEdit.desktop %{tde_datadir}/apps/kedit/keditui.rc %{tde_datadir}/config.kcfg/kedit.kcfg @@ -934,10 +935,10 @@ Development files for %{name}. %{tde_libdir}/libkcmlaptop.la %{tde_libdir}/libkcmlaptop.so %endif -%{tde_libdir}/lib[kt]deinit_ark.la -%{tde_libdir}/lib[kt]deinit_irkick.la -%{tde_libdir}/lib[kt]deinit_kcalc.la -%{tde_libdir}/lib[kt]deinit_kedit.la +%{tde_libdir}/libkdeinit_ark.la +%{tde_libdir}/libkdeinit_irkick.la +%{tde_libdir}/libkdeinit_kcalc.la +%{tde_libdir}/libkdeinit_kedit.la %{tde_libdir}/libkmilo.la %{tde_libdir}/libkmilo.so %{tde_libdir}/libkregexpeditorcommon.la @@ -973,7 +974,6 @@ Development files for %{name}. unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" # Do not build against any "/usr" installed KDE export KDEDIR="%{tde_prefix}" @@ -991,10 +991,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ @@ -1065,6 +1066,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/tdevelop/tdevelop-3.5.13.2.spec b/redhat/tdevelop/tdevelop-3.5.13.2.spec index c5ca687ff..305fb8c0d 100644 --- a/redhat/tdevelop/tdevelop-3.5.13.2.spec +++ b/redhat/tdevelop/tdevelop-3.5.13.2.spec @@ -22,7 +22,7 @@ Name: trinity-tdevelop Summary: Integrated Development Environment for C++/C Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: Development/Tools @@ -65,10 +65,10 @@ Requires: gettext Requires: ctags BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdesdk-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdesdk-devel >= %{tde_version} %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif @@ -77,16 +77,19 @@ BuildRequires: flex # Requires kdesdk3. BuildRequires: subversion-devel BuildRequires: neon-devel -# looks like this is dragged in by apr-devel (dep of subversion-devel), but not -# a dependency + +# LDAP support %if 0%{?suse_version} BuildRequires: openldap2-devel %else BuildRequires: openldap-devel %endif -Obsoletes: trinity-kdevelop < %{version}-%{release} -Provides: trinity-kdevelop = %{version}-%{release} +#ACL support +BuildRequires: libacl-devel + +Obsoletes: trinity-tdevelop < %{version}-%{release} +Provides: trinity-tdevelop = %{version}-%{release} %description The TDevelop Integrated Development Environment provides many features @@ -105,7 +108,7 @@ cross-references to the used libraries; Internationalization support for your application, allowing translators to easily add their target language to a project; -KDevelop also includes WYSIWYG (What you see is what you get)-creation +tdevelop also includes WYSIWYG (What you see is what you get)-creation of user interfaces with a built-in dialog editor; Debugging your application by integrating KDbg; Editing of project-specific pixmaps with KIconEdit; The inclusion of any other program you need for @@ -565,18 +568,12 @@ Provides: trinity-kdevelop-libs = %{version}-%{release} ########## %prep -%setup -q -a1 +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 %patch1 -p0 -b .config %patch2 -p1 %patch3 -p1 -b .xdgmenu %patch4 -p1 -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -589,8 +586,6 @@ Provides: trinity-kdevelop-libs = %{version}-%{release} unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -617,10 +612,11 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ @@ -651,6 +647,9 @@ cd .. %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Rebuild with NDEBUG option diff --git a/redhat/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/tdewebdev/tdewebdev-3.5.13.2.spec index 21a6c9401..267e517ac 100644 --- a/redhat/tdewebdev/tdewebdev-3.5.13.2.spec +++ b/redhat/tdewebdev/tdewebdev-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -19,8 +21,8 @@ %define _docdir %{tde_docdir} Name: trinity-tdewebdev -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Web development applications Group: Applications/Editors @@ -32,7 +34,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: http://download.sourceforge.net/quanta/css.tar.bz2 Source2: http://download.sourceforge.net/quanta/html.tar.bz2 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2 @@ -43,8 +45,8 @@ Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdesdk-devel >= %{version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdesdk-devel >= %{tde_version} BuildRequires: libxslt-devel BuildRequires: libxml2-devel %if 0%{?rhel} == 4 @@ -463,7 +465,8 @@ Summary: Header files and documentation for %{name} Obsoletes: trinity-kdewebdev-devel < %{version}-%{release} Provides: trinity-kdewebdev-devel = %{version}-%{release} -Requires: trinity-tdelibs-devel +Requires: trinity-tdelibs-devel >= %{tde_version} +Requires: %{name} = %{version}-%{release} Requires: trinity-kommander-devel = %{version}-%{release} %description devel @@ -488,16 +491,11 @@ Requires: trinity-kommander-devel = %{version}-%{release} %__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/ %endif -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" + %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" @@ -518,12 +516,13 @@ fi --datadir=%{tde_datadir} \ --libdir=%{tde_libdir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ + --enable-final \ --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependancy-tracking --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt \ + --enable-rpath # WTF hack for RHEL4 %if 0%{?rhel} == 4 @@ -552,22 +551,14 @@ EOF done cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ -# make symlinks relative -pushd %{buildroot}%{tde_tdedocdir}/HTML/en -for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -nfs ../common $i - fi -done -popd - - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 |