rpms/radiusclient-ng/F-8 radiusclient-ng-0.5.6-etc-install.patch, NONE, 1.1 radiusclient-ng.spec, 1.5, 1.6 0003-Applying-radiusclient-ng-etc-install.patch-from-Fedo.patch, 1.1, NONE

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Sun Feb 3 02:54:02 UTC 2008


Author: jcollie

Update of /cvs/pkgs/rpms/radiusclient-ng/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7469

Modified Files:
	radiusclient-ng.spec 
Added Files:
	radiusclient-ng-0.5.6-etc-install.patch 
Removed Files:
	0003-Applying-radiusclient-ng-etc-install.patch-from-Fedo.patch 
Log Message:
Fix substitutions (BZ#236350).

radiusclient-ng-0.5.6-etc-install.patch:

--- NEW FILE radiusclient-ng-0.5.6-etc-install.patch ---
diff --git a/configure.in b/configure.in
index 58fd069..a4241eb 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,9 @@ AC_SUBST(LIBVERSION)
 pkgsysconfdir=${sysconfdir}/$PACKAGE
 AC_SUBST(pkgsysconfdir)
 
+pkgdatadir=${datadir}/$PACKAGE
+AC_SUBST(pkgdatadir)
+
 AC_PROG_LIBTOOL
 
 AC_PROG_CC
diff --git a/etc/Makefile.am b/etc/Makefile.am
index aed318f..51b1188 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -14,9 +14,11 @@ CLEANFILES = *~ radiusclient.conf
 
 sbindir = @sbindir@
 pkgsysconfdir = @pkgsysconfdir@
-pkgsysconf_DATA = issue port-id-map radiusclient.conf \
-	dictionary dictionary.ascend dictionary.compat dictionary.merit \
-	dictionary.sip
+pkgsysconf_DATA = issue port-id-map radiusclient.conf
+
+pkgdatadir = @pkgdatadir@
+pkgdata_DATA = dictionary dictionary.ascend dictionary.compat \
+	dictionary.merit dictionary.sip
 
 EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \
 	dictionary.compat dictionary.merit servers radiusclient.conf.in \
@@ -25,6 +27,7 @@ EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \
 radiusclient.conf: radiusclient.conf.in
 	sed -e 's|@sbin''dir@|$(sbindir)|g' \
 	    -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \
+	    -e 's|@pkgdata''dir@|$(pkgdatadir)|g' \
 	    <$(srcdir)/radiusclient.conf.in >radiusclient.conf
 
 install-data-local: servers
diff --git a/etc/radiusclient.conf.in b/etc/radiusclient.conf.in
index 948bc2f..aac9973 100644
--- a/etc/radiusclient.conf.in
+++ b/etc/radiusclient.conf.in
@@ -47,7 +47,7 @@ servers		@pkgsysconfdir@/servers
 
 # dictionary of allowed attributes and values
 # just like in the normal RADIUS distributions
-dictionary 	@pkgsysconfdir@/dictionary
+dictionary 	@pkgdatadir@/dictionary
 
 # program to call for a RADIUS authenticated login
 login_radius	@sbindir@/login.radius


Index: radiusclient-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/radiusclient-ng/F-8/radiusclient-ng.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- radiusclient-ng.spec	15 Aug 2007 18:32:01 -0000	1.5
+++ radiusclient-ng.spec	3 Feb 2008 02:53:29 -0000	1.6
@@ -1,12 +1,12 @@
 Summary: RADIUS protocol client library
 Name: radiusclient-ng
 Version: 0.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://developer.berlios.de/projects/radiusclient-ng/
 Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
-Patch3: 0003-Applying-radiusclient-ng-etc-install.patch-from-Fedo.patch
+Patch0: radiusclient-ng-0.5.6-etc-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf
@@ -36,7 +36,7 @@
 
 %prep
 %setup0 -q
-%patch3 -p1
+%patch0 -p1
 
 %build
 # Need to re-run autconf & automake so that --disable-rpath works and
@@ -100,6 +100,9 @@
 %{_sbindir}/radstatus
 
 %changelog
+* Sat Feb  2 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.5.6-3
+- Update patch to properly perform substitutions. (BZ#236350)
+
 * Wed Aug 15 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.5.6-2
 - Update to 0.5.6
 


--- 0003-Applying-radiusclient-ng-etc-install.patch-from-Fedo.patch DELETED ---




More information about the fedora-extras-commits mailing list