rpms/NetworkManager-openvpn/F-9 NetworkManager-openvpn-0.7.0-name-file-generation.patch, NONE, 1.1 NetworkManager-openvpn.spec, 1.12, 1.13

Christoph Höger (choeger) fedora-extras-commits at redhat.com
Wed Apr 23 12:54:59 UTC 2008


Author: choeger

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30011

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	NetworkManager-openvpn-0.7.0-name-file-generation.patch 
Log Message:
* Wed Apr 23 2008 Christoph Höger <choeger at cs.tu-berlin.de>
- fix generation of nm-openvpn-service.name
- this time hit f-9 branch



NetworkManager-openvpn-0.7.0-name-file-generation.patch:

--- NEW FILE NetworkManager-openvpn-0.7.0-name-file-generation.patch ---
--- Makefile.am	2008-04-23 12:57:02.000000000 +0200
+++ Makefile.am.new	2008-04-23 12:58:15.000000000 +0200
@@ -25,7 +25,7 @@
 nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
 	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
 		-e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-		-e 's|[@]LIBDIR[@]|$(libdir)|g' \
+		-e 's|[@]PREFIX[@]|$(prefix)|g' \
 		< $(srcdir)/nm-openvpn-service.name.in \
 		> nm-openvpn-service.name
 


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NetworkManager-openvpn.spec	10 Apr 2008 03:55:12 -0000	1.12
+++ NetworkManager-openvpn.spec	23 Apr 2008 12:54:24 -0000	1.13
@@ -10,10 +10,11 @@
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 9%{svn_snapshot}%{?dist}
+Release: 10%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
+Patch: NetworkManager-openvpn-0.7.0-name-file-generation.patch
 # How to build the source package:
 # - Check out NetworkManager from Gnome SVN, currently trunk is used
 # - cd NetworkManager/vpn-daemons/openvpn
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch -p1 -b .buildroot
 
 %build
 if [ ! -f configure ]; then
@@ -105,6 +107,9 @@
 %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Wed Apr 23 2008 Christoph Höger <choeger at cs.tu-berlin.de> 1:0.7.0-10.svn3549
+- (Hopefully) Fix generation of nm-openvpn-service.name (#443389)
+ 
 * Wed Apr 09 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-9.svn3549
 - Update for compat with new NM bits
 




More information about the fedora-extras-commits mailing list