rpms/foomatic
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Updated filters to 3.0-20051209. No longer need rip-cvs patch.

Browse Source
This commit is contained in:
Tim Waugh 2005-12-09 15:16:34 +00:00
parent 3d10151bb2
commit 941de07bb9
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -22,3 +22,4 @@ foomatic-db-3.0-20050804.tar.gz
foomatic-db-3.0-20050907.tar.gz foomatic-db-3.0-20050907.tar.gz
foomatic-db-engine-3.0-20050907.tar.gz foomatic-db-engine-3.0-20050907.tar.gz
foomatic-db-3.0-20051209.tar.gz foomatic-db-3.0-20051209.tar.gz
foomatic-filters-3.0-20051209.tar.gz

10
foomatic-filters-libdir.patch
View File

@ -1,5 +1,5 @@
--- foomatic-filters-3.0-20031217/configure.in.libdir 2003-12-01 20:41:56.000000000 +0000 --- foomatic-filters-3.0-20051209/configure.in.libdir 2005-08-16 03:19:30.000000000 +0100
+++ foomatic-filters-3.0-20031217/configure.in 2003-12-17 13:17:59.827918013 +0000 +++ foomatic-filters-3.0-20051209/configure.in 2005-12-09 14:43:17.000000000 +0000
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -9,7 +9,7 @@
dnl Get the operating system and version number... dnl Get the operating system and version number...
uname=`uname` uname=`uname`
@@ -38,19 +38,19 @@ @@ -38,22 +38,22 @@
AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH) AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
dnl Check for /usr/lib/cups dnl Check for /usr/lib/cups
@ -20,6 +20,10 @@
-AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH) -AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH)
+AC_PATH_DIR(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$LIBSEARCHPATH) +AC_PATH_DIR(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$LIBSEARCHPATH)
dnl Check for /usr/lib/cups/backend
-AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
+AC_PATH_DIR(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$LIBSEARCHPATH)
dnl Check for /usr/lib/ppr dnl Check for /usr/lib/ppr
-AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH) -AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
+AC_PATH_DIR(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH) +AC_PATH_DIR(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH)

15
foomatic.spec
View File

@ -1,6 +1,6 @@
%define dbver 20051209 %define dbver 20051209
%define enginever 3.0-20050907 %define enginever 3.0-20050907
%define filtersver 3.0.2 %define filtersver 20051209
%define hpijsver 1.5-20050613 %define hpijsver 1.5-20050613
%define with_omni 0 %define with_omni 0
@ -18,7 +18,7 @@ Group: System Environment/Libraries
# tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
@ -45,9 +45,6 @@ Patch9: foomatic-printoutmode.patch
# Fix 3.0.2 build. # Fix 3.0.2 build.
Patch10: foomatic-db-engine-xml-cflags.patch Patch10: foomatic-db-engine-xml-cflags.patch
# Applied some foomatic-rip fixes from CVS.
Patch11: foomatic-rip-cvs.patch
# Make foomatic-db-engine build. # Make foomatic-db-engine build.
Patch14: foomatic-ampathxml.patch Patch14: foomatic-ampathxml.patch
@ -92,10 +89,9 @@ The site http://www.linuxprinting.org/ is based on this database.
%prep %prep
%setup -q -c -a 1 -a 2 -a 3 %setup -q -c -a 1 -a 2 -a 3
pushd foomatic-filters-%{filtersver} pushd foomatic-filters-3.0-%{filtersver}
%patch1 -p1 -b .libdir %patch1 -p1 -b .libdir
%patch5 -p1 -b .fontpath %patch5 -p1 -b .fontpath
%patch11 -p1 -b .rip-cvs
./make_configure ./make_configure
popd popd
@ -133,7 +129,7 @@ rm -f db/source/opt/gimp-print-printoutmode.xml
popd popd
%build %build
pushd foomatic-filters-%{filtersver} pushd foomatic-filters-3.0-%{filtersver}
%configure %configure
make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
popd popd
@ -156,7 +152,7 @@ popd
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
pushd foomatic-filters-%{filtersver} pushd foomatic-filters-3.0-%{filtersver}
eval `perl '-V:installvendorlib' '-V:installvendorarch'` eval `perl '-V:installvendorlib' '-V:installvendorarch'`
mkdir -p $RPM_BUILD_ROOT/$installvendorlib mkdir -p $RPM_BUILD_ROOT/$installvendorlib
export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@ -270,6 +266,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Fri Dec 9 2005 Tim Waugh <twaugh@redhat.com> * Fri Dec 9 2005 Tim Waugh <twaugh@redhat.com>
- Updated filters to 3.0-20051209. No longer need rip-cvs patch.
- Updated db to 3.0-20051209. - Updated db to 3.0-20051209.
* Tue Sep 13 2005 Tim Waugh <twaugh@redhat.com> 3.0.2-28 * Tue Sep 13 2005 Tim Waugh <twaugh@redhat.com> 3.0.2-28

2
sources
View File

@ -1,6 +1,6 @@
e5cac8f30f0c39b576c1a25008a06198 gimp-print-foomatic-db-4.2.7.tar.bz2 e5cac8f30f0c39b576c1a25008a06198 gimp-print-foomatic-db-4.2.7.tar.bz2
f0f4c90fa0ae346f53bf19a165e071a6 foomatic-filters-3.0.2.tar.gz
dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2 dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2
37c209488589a4a127b98e4a90aff051 foomatic-db-hpijs-1.5-20050613.tar.gz 37c209488589a4a127b98e4a90aff051 foomatic-db-hpijs-1.5-20050613.tar.gz
f7cc4b9fd231d09620911e471ea30782 foomatic-db-engine-3.0-20050907.tar.gz f7cc4b9fd231d09620911e471ea30782 foomatic-db-engine-3.0-20050907.tar.gz
3cdf7623698918e54a58792646bdac54 foomatic-db-3.0-20051209.tar.gz 3cdf7623698918e54a58792646bdac54 foomatic-db-3.0-20051209.tar.gz
5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz