Author: qboosh Date: Sun Apr 17 09:04:11 2011 GMT Module: packages Tag: HEAD ---- Log message: - added c++ patch (fixes build with current g++) - release 4
---- Files affected: packages/hpijs: hpijs.spec (1.56 -> 1.57) , hpijs-c++.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hpijs/hpijs.spec diff -u packages/hpijs/hpijs.spec:1.56 packages/hpijs/hpijs.spec:1.57 --- packages/hpijs/hpijs.spec:1.56 Sat Feb 27 18:24:18 2010 +++ packages/hpijs/hpijs.spec Sun Apr 17 11:04:06 2011 @@ -7,11 +7,12 @@ Summary(pl.UTF-8): Serwer dla drukarek HP Inkjet Name: hpijs Version: 2.1.4 -Release: 3 +Release: 4 License: BSD Group: Applications/System -Source0: http://dl.sourceforge.net/hpinkjet/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/hpinkjet/%{name}-%{version}.tar.gz # Source0-md5: 7f943ad155c50191a5facdfc2a083110 +Patch0: %{name}-c++.patch URL: http://hpinkjet.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -53,12 +54,12 @@ %prep %setup -q +%patch0 -p1 %build %{__aclocal} %{__autoconf} %{__automake} -CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" %configure \ --enable-foomatic-install \ %{!?with_cups:--disable-cups-install} @@ -75,7 +76,7 @@ DESTDIR=$RPM_BUILD_ROOT %if %{with cups} -rm -f $RPM_BUILD_ROOT%{_cupsppddir}/foomatic-ppds +%{__rm} $RPM_BUILD_ROOT%{_cupsppddir}/foomatic-ppds mv $RPM_BUILD_ROOT{%{_datadir}/ppd/HP/*,%{_cupsppddir}} %endif @@ -90,7 +91,9 @@ %if %{with cups} %files ppd %defattr(644,root,root,755) -%{_cupsppddir}/* +%{_cupsppddir}/HP-*.ppd.gz +%{_cupsppddir}/HP_*.ppd.gz +%{_cupsppddir}/hp_*.ppd.gz %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -99,6 +102,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.57 2011/04/17 09:04:06 qboosh +- added c++ patch (fixes build with current g++) +- release 4 + Revision 1.56 2010/02/27 17:24:18 hawk - release 3 ================================================================ Index: packages/hpijs/hpijs-c++.patch diff -u /dev/null packages/hpijs/hpijs-c++.patch:1.1 --- /dev/null Sun Apr 17 11:04:11 2011 +++ packages/hpijs/hpijs-c++.patch Sun Apr 17 11:04:06 2011 @@ -0,0 +1,22 @@ +--- hpijs-2.1.4/registry.cpp.orig 2005-08-22 20:47:00.000000000 +0200 ++++ hpijs-2.1.4/registry.cpp 2011-04-17 10:28:12.976963265 +0200 +@@ -246,7 +246,7 @@ + device = eDJ3320; + match = TRUE; + } +- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); ++ const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); + if (!cmdStr) + { + cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); +--- hpijs-2.1.4/dj3320.cpp.orig 2005-08-22 20:47:00.000000000 +0200 ++++ hpijs-2.1.4/dj3320.cpp 2011-04-17 10:34:46.600309787 +0200 +@@ -400,7 +400,7 @@ + { + DRIVER_ERROR err = NO_ERROR; + BYTE byDevIDBuffer[DevIDBuffSize]; +- char *pcStr = NULL; ++ const char *pcStr = NULL; + BYTE byStatus1, byStatus2; + + memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer)); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hpijs/hpijs.spec?r1=1.56&r2=1.57&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
