Hello community, here is the log from the commit of package imgvtopgm for openSUSE:Factory checked in at 2015-08-10 09:15:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imgvtopgm (Old) and /work/SRC/openSUSE:Factory/.imgvtopgm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imgvtopgm" Changes: -------- --- /work/SRC/openSUSE:Factory/imgvtopgm/imgvtopgm.changes 2014-12-21 12:04:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.imgvtopgm.new/imgvtopgm.changes 2015-08-10 09:15:51.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 30 11:31:31 UTC 2015 - [email protected] + +- Add imgvtopgm-lib-cleanup.patch: cleanup usage of libraries after + netpbm has been changed to no loner provide all compatibility + names (due to conflicts with openpgm). + +------------------------------------------------------------------- New: ---- imgvtopgm-lib-cleanup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imgvtopgm.spec ++++++ --- /var/tmp/diff_new_pack.68yuCr/_old 2015-08-10 09:15:52.000000000 +0200 +++ /var/tmp/diff_new_pack.68yuCr/_new 2015-08-10 09:15:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package imgvtopgm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,8 @@ #SVN-Clone: svn://svn.code.sf.net/p/imgvtopgm/code/trunk Source: http://downloads.sf.net/%name/%name-%version.tar.gz -Patch: %{name}-%{version}-warnings-fix.diff +Patch0: %{name}-%{version}-warnings-fix.diff +Patch1: imgvtopgm-lib-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnetpbm-devel Requires: netpbm @@ -40,15 +41,10 @@ If you are looking for a cool (and free) image viewer for your Pilot, you should look at TinyViewer (http://www.righto.com/pilot/tv.html). - - -Authors: --------- - Eric Howe <[email protected]> - %prep %setup -qn %name-%version.orig -%patch +%patch0 +%patch1 -p1 %build %configure ++++++ imgvtopgm-lib-cleanup.patch ++++++ Index: imgvtopgm-2.0.orig/configure =================================================================== --- imgvtopgm-2.0.orig.orig/configure +++ imgvtopgm-2.0.orig/configure @@ -2358,14 +2358,14 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" PBM_LIBS="" -echo $ac_n "checking for pbm_init in -lpbm""... $ac_c" 1>&6 -echo "configure:2363: checking for pbm_init in -lpbm" >&5 +echo $ac_n "checking for pbm_init in -lnetpbm""... $ac_c" 1>&6 +echo "configure:2363: checking for pbm_init in -lnetpbm" >&5 ac_lib_var=`echo pbm'_'pbm_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpbm $LIBS" +LIBS="-lnetpbm $LIBS" cat > conftest.$ac_ext <<EOF #line 2371 "configure" #include "confdefs.h" @@ -2393,13 +2393,13 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - PBM_LIBS="$PNM_LIBS -lpbm" + PBM_LIBS="$PNM_LIBS -lnetpbm" else echo "$ac_t""no" 1>&6 fi if test "$PBM_LIBS" = ""; then -{ echo "configure: error: The PBM library '-lpbm' could not be found. +{ echo "configure: error: The PBM library '-lnetpbm' could not be found. Please use the configure options '--with-pnm-includes=DIR' and '--with-pnm-libraries=DIR' to specify the netpbm location. See the 'config.log' file for further diagnostics." 1>&2; exit 1; } @@ -2407,14 +2407,14 @@ fi PGM_LIBS="" -echo $ac_n "checking for pgm_init in -lpgm""... $ac_c" 1>&6 -echo "configure:2412: checking for pgm_init in -lpgm" >&5 +echo $ac_n "checking for pgm_init in -lnetpbm""... $ac_c" 1>&6 +echo "configure:2412: checking for pgm_init in -lnetpbm" >&5 ac_lib_var=`echo pgm'_'pgm_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpgm $PNM_LIBS ${PBM_LIBS} $LIBS" +LIBS="-lnetpbm $PNM_LIBS ${PBM_LIBS} $LIBS" cat > conftest.$ac_ext <<EOF #line 2420 "configure" #include "confdefs.h" @@ -2442,13 +2442,13 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - PGM_LIBS="$PNM_LIBS -lpgm" + PGM_LIBS="$PNM_LIBS -lnetpbm" else echo "$ac_t""no" 1>&6 fi if test "$PGM_LIBS" = ""; then -{ echo "configure: error: The PGM library '-lpgm' could not be found. +{ echo "configure: error: The PGM library '-lnetpbm' could not be found. Please use the configure options '--with-pnm-includes=DIR' and '--with-pnm-libraries=DIR' to specify the netpbm location. See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
