Attachment 148895 Details for Bug 226191 – Suggested specfile patch fixing several issues.

[patch] Suggested specfile patch fixing several issues.

spec.patch (text/plain), 3.24 KB, created by Jason Tibbitts on 2007-02-28 04:38:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Tibbitts

Created: 2007-02-28 04:38:36 UTC

Size: 3.24 KB

patch

obsolete

>Index: netpbm.spec
>===================================================================
>RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
>retrieving revision 1.87
>diff -u -r1.87 netpbm.spec
>--- netpbm.spec	2 Feb 2007 13:13:30 -0000	1.87
>+++ netpbm.spec	28 Feb 2007 04:35:23 -0000
>@@ -1,8 +1,8 @@
>-Summary: A library for handling different graphics file formats.
>+Summary: A library for handling different graphics file formats
> Name: netpbm
> Version: 10.35
> Release: 11%{?dist}
>-License: freeware
>+License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
> Group: System Environment/Libraries
> URL: http://netpbm.sourceforge.net/
> Source0: netpbm-%{version}.l1.tar.bz2
>@@ -27,7 +27,6 @@
> Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
> BuildRequires: libX11-devel
>-Obsoletes: libgr
> 
> %description
> The netpbm package contains a library of functions which support
>@@ -36,10 +35,9 @@
> .ppm (portable pixmaps) and others.
> 
> %package devel
>-Summary: Development tools for programs which will use the netpbm libraries.
>+Summary: Development tools for programs which will use the netpbm libraries
> Group: Development/Libraries
> Requires: netpbm = %{version}-%{release}
>-Obsoletes: libgr-devel
> 
> %description devel
> The netpbm-devel package contains the header files and static libraries,
>@@ -51,10 +49,9 @@
> to have the netpbm package installed.
> 
> %package progs
>-Summary: Tools for manipulating graphics files in netpbm supported formats.
>+Summary: Tools for manipulating graphics files in netpbm supported formats
> Group: Applications/Multimedia
> Requires: netpbm = %{version}-%{release}
>-Obsoletes: libgr-progs
> 
> %description progs
> The netpbm-progs package contains a group of scripts for manipulating the
>@@ -113,6 +110,7 @@
> EOF
> 
> TOP=`pwd`
>+# A parallel make fails badly
> make \
> 	CC=%{__cc} \
> 	CFLAGS="$RPM_OPT_FLAGS -fPIC" \
>@@ -128,9 +126,9 @@
> 	X11LIB=%{_libdir}/libX11.so \
> 	XML2LIBS="NONE"
> 
>-%install
>-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
> 
>+%install
>+rm -rf $RPM_BUILD_ROOT
> mkdir -p $RPM_BUILD_ROOT
> make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
> 
>@@ -146,6 +144,11 @@
> mkdir -p $RPM_BUILD_ROOT%{_mandir}
> tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
> 
>+pushd $RPM_BUILD_ROOT%{_mandir}/man1
>+iconv -f iso8859-1 -t utf-8  pgmminkowski.1 > pgmminkowski.1.conv && \
>+  mv -f pgmminkowski.1.conv pgmminkowski.1  
>+popd
>+
> # Don't ship man pages for non-existent binaries and bogus ones
> for i in hpcdtoppm pcdovtoppm pnmtojbig \
> 	 ppmsvgalib vidtoppm picttoppm jbigtopnm \
>@@ -164,9 +167,11 @@
> rm -rf $RPM_BUILD_ROOT/usr/pkginfo
> rm -rf $RPM_BUILD_ROOT/usr/config_template
> 
>+# Don't ship the static library
>+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.a
> 
> %clean
>-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
>+rm -rf $RPM_BUILD_ROOT
> 
> %post -p /sbin/ldconfig
> 
>@@ -174,13 +179,12 @@
> 
> %files
> %defattr(-,root,root)
>-%doc doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
>+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
> %{_libdir}/lib*.so.*
> 
> %files devel
> %defattr(-,root,root)
> %{_includedir}/*.h
>-%{_libdir}/lib*.a
> %{_libdir}/lib*.so
> %{_mandir}/man3/*
> %files progs

Actions: View | Diff

Attachments on bug 226191: 148895