rpms/foomatic/devel .cvsignore, 1.70, 1.71 foomatic-filters-libdir.patch, 1.6, 1.7 foomatic.spec, 1.212, 1.213 sources, 1.72, 1.73 foomatic-2.0.2-fontpath.patch, 1.4, NONE foomatic-sigpipe.patch, 1.1, NONE
Tim Waugh
twaugh at fedoraproject.org
Thu Jan 15 12:15:15 UTC 2009
- Previous message (by thread): rpms/libewf/devel libewf.spec, 1.10, 1.11 sources, 1.7, 1.8 .cvsignore, 1.6, 1.7
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch, NONE, 1.1 openoffice.org.spec, 1.1755, 1.1756
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26861
Modified Files:
.cvsignore foomatic-filters-libdir.patch foomatic.spec sources
Removed Files:
foomatic-2.0.2-fontpath.patch foomatic-sigpipe.patch
Log Message:
* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 4.0.0-1
- 4.0.0.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore 10 Jan 2009 12:38:45 -0000 1.70
+++ .cvsignore 15 Jan 2009 12:14:44 -0000 1.71
@@ -70,3 +70,6 @@
foomatic-db-3.0-20090110.tar.gz
foomatic-db-hpijs-20090110.tar.gz
foomatic-filters-3.0-20090110.tar.gz
+foomatic-db-4.0-20090115.tar.gz
+foomatic-db-engine-4.0.0.tar.gz
+foomatic-filters-4.0.0.tar.gz
foomatic-filters-libdir.patch:
Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic-filters-libdir.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- foomatic-filters-libdir.patch 2 Sep 2008 12:18:15 -0000 1.6
+++ foomatic-filters-libdir.patch 15 Jan 2009 12:14:44 -0000 1.7
@@ -1,29 +1,12 @@
-diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
---- foomatic-filters-3.0-20080710/configure.ac.libdir 2008-07-10 08:20:16.000000000 +0100
-+++ foomatic-filters-3.0-20080710/configure.ac 2008-09-02 13:13:36.000000000 +0100
-@@ -13,7 +13,7 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
+diff -up foomatic-filters-4.0.0/configure.ac.libdir foomatic-filters-4.0.0/configure.ac
+--- foomatic-filters-4.0.0/configure.ac.libdir 2009-01-14 19:23:15.000000000 +0000
++++ foomatic-filters-4.0.0/configure.ac 2009-01-15 10:57:55.000000000 +0000
+@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname
+
ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=$libdir:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
+-LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
++LIBSEARCHPATH=${libdir}:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
- dnl Get the operating system and version number...
uname=`uname`
-@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
- AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
-
- dnl Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH)
-
- dnl Check for /usr/lib/ppr/interfaces
--AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
-
- dnl Check for /usr/lib/ppr/lib
--AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_LIB,ppr/lib,$libdir/ppr/lib,$LIBSEARCHPATH)
-
- AC_ARG_ENABLE(file-converter-check, [ --enable-file-converter-check check whether a file converter is installed [default=yes]],
- [if eval "test x${enableval} = xno"; then
+ uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- foomatic.spec 12 Jan 2009 18:51:45 -0000 1.212
+++ foomatic.spec 15 Jan 2009 12:14:44 -0000 1.213
@@ -1,12 +1,13 @@
-%define dbver 20090110
-%define enginever 3.0-20090110
-%define filtersver 20090110
+%define dbver_rel 4.0
+%define dbver_snap 20090115
+%define enginever 4.0.0
+%define filtersver 4.0.0
%define hpijsver 20090110
Summary: Database of printers and printer drivers
Name: foomatic
-Version: 3.0.2
-Release: 70%{?dist}
+Version: %{enginever}
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
@@ -16,22 +17,17 @@
# tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.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
+Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
+Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
# Use libdir.
Patch1: foomatic-filters-libdir.patch
Patch2: foomatic-db-engine-libdir.patch
-# Set GS_FONTPATH in gs wrapper (bug #81410).
-Patch5: foomatic-2.0.2-fontpath.patch
-
# Handle non-UTF-8 encodings in imported PPD files.
Patch15: foomatic-bad-utf8.patch
-Patch18: foomatic-sigpipe.patch
-
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -72,24 +68,20 @@
%prep
%setup -q -c -a 1 -a 2 -a 3
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
%patch1 -p1 -b .libdir
-%patch5 -p1 -b .fontpath
-%patch18 -p1 -b .sigpipe
-./make_configure
popd
pushd foomatic-db-engine-%{enginever}
chmod a+x mkinstalldirs
%patch2 -p1 -b .libdir
%patch15 -p1
-./make_configure
popd
pushd foomatic-db-hpijs-%{hpijsver}
popd
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
cd db/source
@@ -121,7 +113,7 @@
export CUPS_FILTERS=/usr/lib/cups/filter # /usr/lib NOT libdir
export CUPS_PPDS=%{_datadir}/cups/model
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
%configure
make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
popd
@@ -131,7 +123,7 @@
make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
popd
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
%configure
make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
popd
@@ -144,7 +136,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
eval `perl '-V:installvendorlib' '-V:installvendorarch'`
mkdir -p $RPM_BUILD_ROOT/$installvendorlib
export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@@ -152,7 +144,7 @@
make DESTDIR=%buildroot PREFIX=%{_prefix} \
INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
- install
+ install-main install-cups
popd
pushd foomatic-db-engine-%{enginever}
@@ -162,7 +154,7 @@
install
popd
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
make DESTDIR=%buildroot PREFIX=%{_prefix} \
INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
@@ -232,6 +224,9 @@
%{_var}/cache/foomatic
%changelog
+* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 4.0.0-1
+- 4.0.0.
+
* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
- Major gutenprint version is 5.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources 10 Jan 2009 12:38:46 -0000 1.72
+++ sources 15 Jan 2009 12:14:44 -0000 1.73
@@ -1,4 +1,4 @@
-cfd3335798141fa5892693b39c71f71c foomatic-db-engine-3.0-20090110.tar.gz
-8948e38765cb108221cfb3d1c9af0dd0 foomatic-db-3.0-20090110.tar.gz
aa6b0fd89f33fcef91a3a7081b44fc36 foomatic-db-hpijs-20090110.tar.gz
-0d8702e00187a54d5cfd4cdfbab682e1 foomatic-filters-3.0-20090110.tar.gz
+a349bc055d92a47bfbd8b7812beba690 foomatic-db-4.0-20090115.tar.gz
+7e2281ef8b96557afd0cd87400176805 foomatic-db-engine-4.0.0.tar.gz
+1c77a8c86a8fb19012cd79f735564ea2 foomatic-filters-4.0.0.tar.gz
--- foomatic-2.0.2-fontpath.patch DELETED ---
--- foomatic-sigpipe.patch DELETED ---
- Previous message (by thread): rpms/libewf/devel libewf.spec, 1.10, 1.11 sources, 1.7, 1.8 .cvsignore, 1.6, 1.7
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch, NONE, 1.1 openoffice.org.spec, 1.1755, 1.1756
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list