[packages/kvpnc] - up to 0.9.6a for KDE4

[baggins]

commit b850d282ffdcf06c037522a75802c7ee23a69246
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 2 18:07:17 2014 +0100

    - up to 0.9.6a for KDE4

 kvpnc.spec  | 51 ++++++++++++++++++---------------------------------
 sleep.patch | 10 ++++++++++
 2 files changed, 28 insertions(+), 33 deletions(-)
---
diff --git a/kvpnc.spec b/kvpnc.spec
index 37c93b9..9610c6c 100644
--- a/kvpnc.spec
+++ b/kvpnc.spec
@@ -1,15 +1,16 @@
 Summary:	GUI for VPN Client for various servers
 Summary(pl.UTF-8):	GUI dla klienta dla różnych serwerów VPN
 Name:		kvpnc
-Version:	0.9.1
-Release:	3
+Version:	0.9.6a
+Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://download.gna.org/kvpnc/%{name}-%{version}.tar.bz2
-# Source0-md5:	3334211b26c2e265c032ec31448210cf
+Source0:	http://download.gna.org/kvpnc/%{name}-%{version}-kde4.tar.bz2
+# Source0-md5:	bf8b7224284f5d3f8ad5235c599fe9e7
+Patch0:		sleep.patch
 URL:		http://home.gna.org/kvpnc/en/index.html
-BuildRequires:	automake
-BuildRequires:	kdelibs-devel >= 9:3.2
+BuildRequires:	automoc4
+BuildRequires:	kde4-kdelibs-devel
 BuildRequires:	libgcrypt-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
@@ -34,47 +35,31 @@ cisco3000. FreeS/WAN (OpenS/WAN) jest klientem ipsecowym dla Linux
 PPTP (pptpclient) oraz OpenVPN.
 
 %prep
-%setup -q
-
-cp -f /usr/share/automake/config.* admin
+%setup -q -n %{name}-%{version}-kde4
+%patch0 -p1
 
 %build
-#%{__sed} -i 's,<UI version="3.1",<UI version="3.2",' src/*.ui
-#%{__make} -f admin/Makefile.common
-%configure \
-	--with-qt-libraries=%{_libdir}
+install -d build
+cd build
+%cmake \
+	../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/config,%{_desktopdir},%{_sbindir}}
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/%{name}.desktop \
-	$RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-mv -f $RPM_BUILD_ROOT%{_bindir}/%{name} \
-	$RPM_BUILD_ROOT%{_sbindir}/%{name}
-
-echo "Comment[pl]=Klient vpnc dla KDE" >> \
-	$RPM_BUILD_ROOT%{_datadir}/apps/kvpnc/eventsrc
 
-install src/%{name}ui.rc $RPM_BUILD_ROOT%{_datadir}/config
+%{__make} -C build install/fast \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-kde
+%{__mv} -f $RPM_BUILD_ROOT%{_desktopdir}/{kde4,}/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/*
 %{_datadir}/apps/kvpnc
-%{_datadir}/config/*
 %{_desktopdir}/%{name}.desktop
 %{_iconsdir}/hicolor/*/*/*
-# shouldn't be as regular %doc?
-%{_kdedocdir}/kvpnc
diff --git a/sleep.patch b/sleep.patch
new file mode 100644
index 0000000..3758d45
--- /dev/null
+++ b/sleep.patch
@@ -0,0 +1,10 @@
+--- kvpnc-0.9.6a-kde4/src/kvpnc.cpp~	2010-03-08 11:26:33.000000000 +0100
++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp	2014-01-02 17:59:40.952707931 +0100
+@@ -75,6 +75,7 @@
+ #include <cstdlib>
+ #include <ctime>
+ #include <iomanip>
++#include <unistd.h>
+ 
+ #include "ui_mainviewbase4.h"
+ #include "ciscocertificateenrollment.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kvpnc.git/commitdiff/b850d282ffdcf06c037522a75802c7ee23a69246