rpms/gutenprint/F-8 .cvsignore, 1.4, 1.5 gutenprint-O6.patch, 1.1, 1.2 gutenprint.spec, 1.35, 1.36 sources, 1.4, 1.5 gutenprint-lpstat.patch, 1.1, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Jan 18 12:28:40 UTC 2008
- Previous message (by thread): rpms/gutenprint/devel .cvsignore, 1.4, 1.5 gutenprint-O6.patch, 1.1, 1.2 gutenprint.spec, 1.36, 1.37 sources, 1.4, 1.5 gutenprint-lpstat.patch, 1.1, NONE
- Next message (by thread): rpms/lvm2/devel lvm2.spec,1.126,1.127
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/gutenprint/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956
Modified Files:
.cvsignore gutenprint-O6.patch gutenprint.spec sources
Removed Files:
gutenprint-lpstat.patch
Log Message:
* Fri Jan 18 2008 Tim Waugh <twaugh at redhat.com> 5.0.2-1
- 5.0.2. No longer need lpstat patch.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 26 Jun 2007 16:40:08 -0000 1.4
+++ .cvsignore 18 Jan 2008 12:28:02 -0000 1.5
@@ -1,3 +1,4 @@
gutenprint-5.0.0.tar.bz2
gutenprint-5.0.0.99.1.tar.bz2
gutenprint-5.0.1.tar.bz2
+gutenprint-5.0.2.tar.bz2
gutenprint-O6.patch:
Index: gutenprint-O6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-8/gutenprint-O6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint-O6.patch 4 May 2007 14:27:34 -0000 1.1
+++ gutenprint-O6.patch 18 Jan 2008 12:28:02 -0000 1.2
@@ -1,38 +1,7 @@
---- gutenprint-5.0.0.99.1/configure.ac.O6 2007-05-04 15:22:21.000000000 +0100
-+++ gutenprint-5.0.0.99.1/configure.ac 2007-05-04 15:23:39.000000000 +0100
-@@ -645,29 +645,6 @@
- PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
- AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
-
--dnl Compiler flags
--if test x$ac_compiler_gnu = "xyes"; then
-- STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576],, [GNUCFLAGS])
-- if test x${USE_MAINTAINER_MODE} = xyes ; then
-- STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
-- fi
-- if test x$ENABLE_DEBUG = xyes ; then
-- STP_ADD_COMPILER_ARG([-g])
-- else
-- STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
-- fi
--else
-- if test x$ENABLE_DEBUG = xyes ; then
-- STP_ADD_COMPILER_ARG([-g])
-- else
-- STP_ADD_FIRST_COMPILER_ARG([-O])
-- fi
--fi
--if test x$ENABLE_PROFILE = xyes ; then
-- STP_ADD_COMPILER_ARG([-pg])
--fi
--AC_SUBST(GNUCFLAGS)
--
- AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
- [Define to 1 if GCC special attributes are supported])
- AC_MSG_CHECKING([if $CC supports __attribute__ syntax])
---- gutenprint-5.0.0.99.1/configure.O6 2007-05-04 15:22:29.000000000 +0100
-+++ gutenprint-5.0.0.99.1/configure 2007-05-04 15:25:59.000000000 +0100
-@@ -26076,532 +26076,6 @@
+diff -up gutenprint-5.0.2/configure.O6 gutenprint-5.0.2/configure
+--- gutenprint-5.0.2/configure.O6 2008-01-18 12:19:25.000000000 +0000
++++ gutenprint-5.0.2/configure 2008-01-18 12:21:05.000000000 +0000
+@@ -26044,410 +26044,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -72,27 +41,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -147,27 +99,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -221,27 +156,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -295,27 +213,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -371,27 +272,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -445,27 +329,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -521,27 +388,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
- stp_newCFLAGS="$CFLAGS"
@@ -559,9 +409,39 @@
- CFLAGS="${stp_newCFLAGS}"
-
-fi
--
--
--
- { echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
- echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6; }
+
+
+diff -up gutenprint-5.0.2/configure.ac.O6 gutenprint-5.0.2/configure.ac
+--- gutenprint-5.0.2/configure.ac.O6 2008-01-18 12:18:40.000000000 +0000
++++ gutenprint-5.0.2/configure.ac 2008-01-18 12:19:20.000000000 +0000
+@@ -648,29 +648,6 @@ AH_TEMPLATE(PKGMODULEDIR,, [Package modu
+ PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
+ AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
+
+-dnl Compiler flags
+-if test x$ac_compiler_gnu = "xyes"; then
+- STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576],, [GNUCFLAGS])
+- if test x${USE_MAINTAINER_MODE} = xyes ; then
+- STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
+- fi
+- if test x$ENABLE_DEBUG = xyes ; then
+- STP_ADD_COMPILER_ARG([-g])
+- else
+- STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
+- fi
+-else
+- if test x$ENABLE_DEBUG = xyes ; then
+- STP_ADD_COMPILER_ARG([-g])
+- else
+- STP_ADD_FIRST_COMPILER_ARG([-O])
+- fi
+-fi
+-if test x$ENABLE_PROFILE = xyes ; then
+- STP_ADD_COMPILER_ARG([-pg])
+-fi
+-AC_SUBST(GNUCFLAGS)
+-
+ AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
+ [Define to 1 if GCC special attributes are supported])
+ AC_MSG_CHECKING([if $CC supports __attribute__ syntax])
Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-8/gutenprint.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gutenprint.spec 10 Oct 2007 14:18:58 -0000 1.35
+++ gutenprint.spec 18 Jan 2008 12:28:02 -0000 1.36
@@ -3,15 +3,14 @@
Name: gutenprint
Summary: Printer Drivers Package
-Version: 5.0.1
-Release: 6%{?dist}
+Version: 5.0.2
+Release: 1%{?dist}
Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/
Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
Source1: gutenprint-foomaticppdupdate
Patch0: gutenprint-menu.patch
-Patch1: gutenprint-lpstat.patch
-Patch2: gutenprint-O6.patch
+Patch1: gutenprint-O6.patch
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10
@@ -126,8 +125,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .menu
-%patch1 -p1 -b .lpstat
-%patch2 -p1 -b .O6
+%patch1 -p1 -b .O6
%build
%ifarch ppc64
@@ -186,7 +184,7 @@
%if %{build_with_ijs_support}
%{_mandir}/man1/ijsgutenprint.1*
%endif
-%{_datadir}/gutenprint/%{version}
+%{_datadir}/gutenprint
%{_libdir}/*.so.*
%{_libdir}/gutenprint/
@@ -199,7 +197,6 @@
%{_includedir}/gutenprintui2/
%{_libdir}/*.so
%{_libdir}/pkgconfig/gutenprint.pc
-%{_libdir}/pkgconfig/gutenprintui.pc
%{_libdir}/pkgconfig/gutenprintui2.pc
%exclude %{_libdir}/*.la
@@ -242,6 +239,12 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Fri Jan 18 2008 Tim Waugh <twaugh at redhat.com> 5.0.2-1
+- 5.0.2. No longer need lpstat patch.
+
+* Mon Jan 7 2008 Tim Waugh <twaugh at redhat.com>
+- Own %%{_datadir}/gutenprint (bug #427801).
+
* Fri Oct 5 2007 Tim Waugh <twaugh at redhat.com> 5.0.1-5
- Don't ship samples in the main package.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 26 Jun 2007 16:40:08 -0000 1.4
+++ sources 18 Jan 2008 12:28:02 -0000 1.5
@@ -1 +1 @@
-4ec66d57c1014b503d6bea16b1c31d81 gutenprint-5.0.1.tar.bz2
+ca6c45616caa720e9e185817272b08d7 gutenprint-5.0.2.tar.bz2
--- gutenprint-lpstat.patch DELETED ---
- Previous message (by thread): rpms/gutenprint/devel .cvsignore, 1.4, 1.5 gutenprint-O6.patch, 1.1, 1.2 gutenprint.spec, 1.36, 1.37 sources, 1.4, 1.5 gutenprint-lpstat.patch, 1.1, NONE
- Next message (by thread): rpms/lvm2/devel lvm2.spec,1.126,1.127
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list