summaryrefslogtreecommitdiffstats
path: root/redhat/applications/knutclient
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-19 15:24:00 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-19 15:24:00 +0200
commit47b9cb5f610258da5818461ffcb4b97cfacd649b (patch)
tree6593f97816e32d408bb117ef2dd17d061fd4039e /redhat/applications/knutclient
parent17e804faf6d943909d4285bf7e1fe743151b63b2 (diff)
downloadtde-packaging-47b9cb5f610258da5818461ffcb4b97cfacd649b.tar.gz
tde-packaging-47b9cb5f610258da5818461ffcb4b97cfacd649b.zip
RPM packaging: update knutclient, koffice, koffice-i18n, konversation, kopete-otr
Diffstat (limited to 'redhat/applications/knutclient')
-rw-r--r--redhat/applications/knutclient/knutclient-14.0.0.spec97
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.1.spec141
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.spec133
3 files changed, 67 insertions, 304 deletions
diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec
index e471ba9cb..c11bf6267 100644
--- a/redhat/applications/knutclient/knutclient-14.0.0.spec
+++ b/redhat/applications/knutclient/knutclient-14.0.0.spec
@@ -1,53 +1,79 @@
-# Default version for this component
-%define tde_pkg knutclient
+#
+# spec file for package knutclient (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg knutclient
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-Name: trinity-%{tde_pkg}
-Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version: 0.9.5
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.9.5
+Release: %{?!preversion:0}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
+Group: Applications/Utilities
+URL: http://www.knut.noveradsl.cz/knutclient/
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.knut.noveradsl.cz/knutclient/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@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}-%{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: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
%description
KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
@@ -56,14 +82,21 @@ information, presented in a nice visual format, can be invaluable on
stations using an UPS.
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+# Fix permissions
+chmod 644 AUTHORS README TODO COPYING ChangeLog
+
%__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"
@@ -100,6 +133,10 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
%clean
%__rm -rf %{buildroot}
@@ -119,7 +156,7 @@ done
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/knutclient
%{tde_datadir}/applnk/Utilities/knutclient.desktop
%{tde_datadir}/apps/knutclient/knutclientui.rc
@@ -130,5 +167,5 @@ done
%{tde_datadir}/icons/locolor/*/apps/*.png
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9.5-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.1.spec b/redhat/applications/knutclient/knutclient-3.5.13.1.spec
deleted file mode 100644
index e10e2a487..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.1.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-# Default version for this component
-%define kdecomp knutclient
-
-# 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
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_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
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version: 0.9.5
-Release: 3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# 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"
-
-
-%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} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.spec b/redhat/applications/knutclient/knutclient-3.5.13.spec
deleted file mode 100644
index 989670893..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.spec
+++ /dev/null
@@ -1,133 +0,0 @@
-# Default version for this component
-%define kdecomp knutclient
-
-# 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
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version: 0.9.5
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.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} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-