rpms/cupsddk/F-8 cupsddk-ddkdatadir.patch, NONE, 1.1 cupsddk.spec, 1.8, 1.9

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21873

Modified Files:
	cupsddk.spec 
Added Files:
	cupsddk-ddkdatadir.patch 
Log Message:
* Thu Jan 17 2008 Tim Waugh <twaugh at redhat.com> 1.2.3-3
- Build with corrected DDK_DATADIR (bug #428504).


cupsddk-ddkdatadir.patch:

--- NEW FILE cupsddk-ddkdatadir.patch ---
diff -up cupsddk-1.2.3/configure.in.ddkdatadir cupsddk-1.2.3/configure.in
--- cupsddk-1.2.3/configure.in.ddkdatadir	2008-01-17 18:05:14.000000000 +0000
+++ cupsddk-1.2.3/configure.in	2008-01-17 18:05:21.000000000 +0000
@@ -308,7 +308,7 @@ if test "x$docdir" = xNONE; then
 fi
 
 AC_DEFINE_UNQUOTED(DDK_DOCDIR, "$docdir")
-AC_DEFINE_UNQUOTED(DDK_DATADIR, "$datadir")
+AC_DEFINE_UNQUOTED(DDK_DATADIR, "$datadir/cupsddk")
 AC_DEFINE_UNQUOTED(PPDC_INCLUDE_DIR, "$datadir/cupsddk/include")
 AC_DEFINE_UNQUOTED(PPDC_PO_DIR, "$datadir/cupsddk/po")
 
diff -up cupsddk-1.2.3/configure.ddkdatadir cupsddk-1.2.3/configure
--- cupsddk-1.2.3/configure.ddkdatadir	2008-01-17 18:05:27.000000000 +0000
+++ cupsddk-1.2.3/configure	2008-01-17 18:05:36.000000000 +0000
@@ -5556,7 +5556,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define DDK_DATADIR "$datadir"
+#define DDK_DATADIR "$datadir/cupsddk"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-8/cupsddk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cupsddk.spec	15 Jan 2008 12:59:37 -0000	1.8
+++ cupsddk.spec	17 Jan 2008 18:10:50 -0000	1.9
@@ -16,13 +16,14 @@
 Summary: CUPS Driver Development Kit
 Name: cupsddk
 Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
 Patch0: cupsddk-no-gzip-man-pages.patch
 Patch1: cupsddk-smp-build.patch
 Patch2: cupsddk-no-strip.patch
+Patch3: cupsddk-ddkdatadir.patch
 Url: http://www.cups.org/ddk/
 
 # Use buildroot so as not to disturb the version already installed
@@ -64,6 +65,7 @@
 %patch0 -p1 -z .no-gzip-man-pages
 %patch1 -p1 -z .smp-build
 %patch2 -p1 -z .no-strip
+%patch3 -p1 -z .ddkdatadir
 
 %build
 %configure --with-optim="$RPM_OPT_FLAGS"
@@ -116,6 +118,9 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Thu Jan 17 2008 Tim Waugh <twaugh at redhat.com> 1.2.3-3
+- Build with corrected DDK_DATADIR (bug #428504).
+
 * Tue Jan 15 2008 Tim Waugh <twaugh at redhat.com> 1.2.3-2
 - Ship cupsprofile.ppm (bug #428504).