RPM Packaging: add applications for R14

2 files changed, 136 insertions, 113 deletions

diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
new file mode 100644
index 000000000..bad003d7a
--- /dev/null
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -0,0 +1,136 @@
+# Default version for this component
+%define tde_pkg kvpnc
+%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_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_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:		vpn clients frontend for TDE
+Version:		0.9.6a
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+%description
+KVpnc is a TDE frontend for various vpn clients.
+
+It supports :
+* Cisco-compatible VPN client (vpnc)
+* IPSec (freeswan, openswan, racoon)
+* Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
+* Virtual Private Network daemon (openvpn)
+
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%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"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+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 \
+  --enable-closure
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+%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
+update-desktop-database %{tde_appdir} -q &> /dev/null ||:
+
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+update-desktop-database %{tde_appdir} -q &> /dev/null ||:
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kvpnc
+%{tde_datadir}/applnk/kvpnc.desktop
+%{tde_datadir}/apps/kvpnc/
+%lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
+%lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
+%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kvpnc/
+%{tde_datadir}/doc/tde/HTML/kvpnc/
+%lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
+%{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
+%{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+
+
+%Changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1
+- Initial release for TDE 14.0.0
+
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec
deleted file mode 100644
index 930dcf410..000000000
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ /dev/null
@@ -1,113 +0,0 @@
-# Default version for this component
-%define kdecomp kvpnc
-%define version 0.9.6a
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-
-Name:		trinity-%{kdecomp}
-Summary:	vpn clients frontend for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-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)
-
-Source0:	%{kdecomp}-master.tar.gz
-Source1:	admin-master.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-KVpnc is a TDE frontend for various vpn clients.
-
-It supports :
- * Cisco-compatible VPN client (vpnc)
- * IPSec (freeswan, openswan, racoon)
- * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
- * Virtual Private Network daemon (openvpn)
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt.sh
-%setup -q -n %{kdecomp}-master
-
-# 'admin' folder from GIT
-%setup -q -n %{kdecomp}-master -a 1
-%__rm -rf admin
-%__mv -f admin-master admin
-
-# 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,%{_includedir}/tqt,g" \
-	-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-
-
-
-%Changelog
-* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-