Hello community, here is the log from the commit of package hp-officeJet checked in at Mon Oct 30 00:11:44 CET 2006. -------- --- hp-officeJet/hp-officeJet.changes 2006-06-14 16:02:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/hp-officeJet/hp-officeJet.changes 2006-10-29 20:46:56.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 29 20:46:45 CET 2006 - meissner@suse.de + +- RPM_OPT_FLAGS for libs directory. + +------------------------------------------------------------------- New: ---- hpoj-optflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hp-officeJet.spec ++++++ --- /var/tmp/diff_new_pack.n0XyYu/_old 2006-10-30 00:11:40.000000000 +0100 +++ /var/tmp/diff_new_pack.n0XyYu/_new 2006-10-30 00:11:40.000000000 +0100 @@ -14,11 +14,11 @@ BuildRequires: libdrm-devel libtiff-devel libusb net-snmp-devel qt3-devel resmgr update-desktop-files Summary: A Driver for HP OfficeJet All-in-One Devices Version: 0.91 -Release: 145 +Release: 162 Group: Hardware/Printing #Requires: #Provides: -License: GPL +License: GNU General Public License (GPL) - all versions URL: http://hpoj.sourceforge.net Source0: hpoj-%{version}.tar.bz2 # Source1 is the system startup script for the PTAL daemon @@ -39,6 +39,8 @@ Patch2: 64bit.diff # Fix duplicate parameter name in remsockLookup in ExMlcTransport.h: Patch3: fix-remsockLookup.patch +# pass RPM_OPT_FLAGS to libs/hpoj/ +Patch4: hpoj-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq Requires: resmgr @@ -68,6 +70,7 @@ %patch2 # Fix duplicate parameter name in remsockLookup in ExMlcTransport.h: %patch3 +%patch4 %build %define SWITCH --prefix=/usr @@ -90,7 +93,7 @@ --with-cups-backend=$RPM_BUILD_ROOT/usr/%_lib/cups/backend/ \ --with-sane-backend=$RPM_BUILD_ROOT/usr/%_lib/sane \ --with-sane-etc=$RPM_BUILD_ROOT/etc/sane.d -make +make OPTFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector-all" %install if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then @@ -171,6 +174,8 @@ # spec file ends here %changelog -n hp-officeJet +* Sun Oct 29 2006 - meissner@suse.de +- RPM_OPT_FLAGS for libs directory. * Wed Jun 14 2006 - jsmeix@suse.de - Fixed duplicate parameter name in ExMlcTransport.h according to how it is used in ExMlcTransport.cpp ++++++ hpoj-optflags.patch ++++++ --- lib/hpojip/Makefile.in +++ lib/hpojip/Makefile.in @@ -26,7 +26,8 @@ # TODO: Detect system endianness in configure script! # For now, little-endian (Intel LSB-first) is assumed. -CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ +OPTFLAGS = -O +CFLAGS=$(OPTFLAGS) -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ %.shared.o: %.c $(INCLUDES) $(CC) $(CFLAGS) -DHPOJIP_INTERNAL -fPIC -c -o $@ $< --- lib/ptal/Makefile.in +++ lib/ptal/Makefile.in @@ -17,7 +17,8 @@ MLCDDIR=../../mlcd INCLUDES=Makefile $(INCLUDEDIR)/ptal.h ptal-internal.h $(MLCDDIR)/mlcd.h -CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE +OPTFLAGS=-O +CFLAGS=$(OPTFLAGS) -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE %.shared.o: %.c $(INCLUDES) $(CC) $(CFLAGS) -fPIC -c -o $@ $< --- lib/sane/Makefile.in +++ lib/sane/Makefile.in @@ -16,7 +16,8 @@ INCLUDEDIR=../../include INCLUDES=Makefile $(INCLUDEDIR)/ptal.h hpoj.h hpoj-tables.h sane.h saneopts.h -CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ +OPTFLAGS=-O +CFLAGS=$(OPTFLAGS) -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ %.shared.o: %.c $(INCLUDES) $(CC) $(CFLAGS) -fPIC -c -o $@ $< ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de