From dbb5d8edace14bd8455811ac6802928b27425199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 20 Jul 2013 12:41:12 +0200
Subject: RPM Packaging: fix kvpnc

---
 .../applications/kvpnc/kvpnc-14.0.0-fix_install.patch | 19 +++++++++++++++++++
 redhat/applications/kvpnc/kvpnc-14.0.0.spec           |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch

(limited to 'redhat/applications/kvpnc')

diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
new file mode 100644
index 000000000..1d5b6b300
--- /dev/null
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
@@ -0,0 +1,19 @@
+--- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI	2013-07-20 12:35:51.155931996 +0200
++++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am	2013-07-20 12:37:49.601226585 +0200
+@@ -57,13 +57,13 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(kde_appsdir)/
+-	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
++	$(mkinstalldirs) $(xdg_appsdir)/
++	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
+ 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
+ 	$(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
+ 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
+ 	$(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
+-	$(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
++	$(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
+ 	$(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
+ 	$(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
+ #	$(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
index bad003d7a..60a9f80c9 100644
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -41,6 +41,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:			kvpnc-14.0.0-fix_install.patch
+
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -65,6 +67,7 @@ It supports :
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .installdir
 
 %__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"
@@ -119,7 +122,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{tde_bindir}/kvpnc
-%{tde_datadir}/applnk/kvpnc.desktop
+%{tde_tdeappdir}/kvpnc.desktop
 %{tde_datadir}/apps/kvpnc/
 %lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
 %lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
-- 
cgit v1.2.3