diff options
Diffstat (limited to 'redhat/applications/kvpnc')
-rw-r--r-- | redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch | 19 | ||||
-rw-r--r-- | redhat/applications/kvpnc/kvpnc-14.0.0.patch | 19 | ||||
-rw-r--r-- | redhat/applications/kvpnc/kvpnc.spec | 5 |
3 files changed, 1 insertions, 42 deletions
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch deleted file mode 100644 index 1d5b6b300..000000000 --- a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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.patch b/redhat/applications/kvpnc/kvpnc-14.0.0.patch deleted file mode 100644 index 1d5b6b300..000000000 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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.spec b/redhat/applications/kvpnc/kvpnc.spec index d2d9fc81b..a1421fd20 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.0.7 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -56,8 +56,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch - BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils @@ -111,7 +109,6 @@ It supports : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .installdir %build |