From 3981ced036cda6b6a52203f600990c360571d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 17 Aug 2013 23:16:27 +0200 Subject: RPM Packaging: update packages for 3.5.13.2 under Fedora 19 --- .../applications/knetload/knetload-3.5.13.2.spec | 64 ++++++++++++---------- 1 file changed, 34 insertions(+), 30 deletions(-) (limited to 'redhat/applications/knetload/knetload-3.5.13.2.spec') 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 -URL: http://www.trinitydesktop.org +Vendor: Trinity Project +Packager: Francois Andriot +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 - 2.3-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 2.3-4 - Initial release for TDE 3.5.13.2 -- cgit v1.2.1