Hello community, here is the log from the commit of package jpeg for openSUSE:Factory checked in at Fri Jun 12 17:20:14 CEST 2009. -------- --- jpeg/jpeg.changes 2009-01-14 09:03:44.000000000 +0100 +++ jpeg/jpeg.changes 2009-06-10 00:44:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 10 00:35:17 CEST 2009 - crrodriguez@suse.de + +- disable static libraries +- support DESTDIR + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- jpeg-6b-destdir-1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpeg.spec ++++++ --- /var/tmp/diff_new_pack.p23642/_old 2009-06-12 17:15:43.000000000 +0200 +++ /var/tmp/diff_new_pack.p23642/_new 2009-06-12 17:15:43.000000000 +0200 @@ -23,7 +23,7 @@ Group: Productivity/Graphics/Convertors AutoReqProv: on Version: 6b -Release: 879 +Release: 881 Summary: Independent JPEG Group's JPEG Software Url: http://www.ijg.org/ Source: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2 @@ -33,6 +33,7 @@ Patch3: jpeg-6b-tiff-ojpeg.patch Patch4: jpeg-6b-jpegtran.patch Patch5: jpeg-6b-cplusplus.patch +Patch6: http://svn.cross-lfs.org/svn/repos/patches/jpeg/jpeg-6b-destdir-1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,7 +79,7 @@ %package -n libjpeg License: BSD 3-Clause Version: 6.2.0 -Release: 879 +Release: 881 Summary: JPEG libraries Group: System/Libraries AutoReqProv: on @@ -102,7 +103,7 @@ %package -n libjpeg-devel License: BSD 3-Clause Version: 6.2.0 -Release: 145 +Release: 147 Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ Requires: libjpeg = 6.2.0 @@ -120,37 +121,34 @@ %prep -%setup -n jpeg-6b +%setup -q -n jpeg-6b %patch %patch1 %patch2 %patch3 %patch4 %patch5 +%patch6 -p1 %build %{?suse_update_config:%{suse_update_config -f}} sed -e 's/powerpc/flowerpower/' < ltconfig > ltconfig.new mv ltconfig.new ltconfig chmod u+x ltconfig -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \ - --enable-shared --enable-static --mandir=%{_mandir} \ - --libdir=%{_libdir} -make libdir=%{_libdir} +%configure --disable-static --enable-shared --with-pic +%{__make} %{?jobs:-j%jobs} libdir=%{_libdir} + +%check make test libdir=%{_libdir} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT{%{_libdir},/usr/{include,bin}} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -make prefix=$RPM_BUILD_ROOT/usr \ - mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 \ - libdir=$RPM_BUILD_ROOT/%{_libdir} \ - install install-lib install-headers +#mkdir -p $RPM_BUILD_ROOT{%{_libdir},/usr/{include,bin}} +#mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 +%makeinstall libdir=%{_libdir} rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la %clean -test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -n libjpeg -p /sbin/ldconfig @@ -171,10 +169,12 @@ %files -n libjpeg-devel %defattr(-,root,root) /usr/include/*.h -%{_libdir}/libjpeg.a %{_libdir}/libjpeg.so %changelog +* Wed Jun 10 2009 crrodriguez@suse.de +- disable static libraries +- support DESTDIR * Wed Jan 14 2009 olh@suse.de - obsolete libjpeg-XXbit instead of jpeg-XXbit * Wed Dec 10 2008 olh@suse.de ++++++ jpeg-6b-destdir-1.patch ++++++ Submitted By: Andrew "Weibullguy" Rowland <darowland_at_ieee_dot_org> Date: 2008-02-18 Initial Package Version: 6b Origin: Self Description: Allows the use of DESTDIR when installing. Upstream Status: Not submitted. diff -Naur jpeg-6b-orig/makefile.cfg jpeg-6b/makefile.cfg --- jpeg-6b-orig/makefile.cfg 1998-03-21 19:08:57.000000000 +0000 +++ jpeg-6b/makefile.cfg 2008-02-18 17:07:38.000000000 +0000 @@ -191,25 +191,29 @@ # Installation rules: install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ - $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg - $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg - $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran - $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom - $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom - $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext) - $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext) - $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext) - $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext) - $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext) + $(INSTALL) -dvm755 $(DESTDIR)$(bindir)/$(binprefix) + $(INSTALL) -dvm755 $(DESTDIR)$(mandir)/$(manprefix) + $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg + $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran + $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom + $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom + $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext) + $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext) + $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext) install-lib: libjpeg.$(A) install-headers - $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A) + $(INSTALL) -dvm755 $(DESTDIR)$(libdir) + $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A) install-headers: jconfig.h - $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h - $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h - $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h - $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h + $(INSTALL) -dvm755 $(DESTDIR)$(includedir) + $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h + $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)/$(includedir)/jpeglib.h + $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)/$(includedir)/jmorecfg.h + $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)/$(includedir)/jerror.h clean: $(RM) *.o *.lo libjpeg.a libjpeg.la ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org