Attachment 147350 Details for Bug 227334 – spec diff

[patch] spec diff

spec-1.2.16.diff (text/plain), 3.31 KB, created by Marius Feraru on 2007-02-05 12:43:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Feraru

Created: 2007-02-05 12:43:47 UTC

Size: 3.31 KB

patch

obsolete

>--- libpng.spec.1.2.10-7	2006-10-02 18:05:30.000000000 +0300
>+++ libpng.spec	2007-02-05 14:31:44.000000000 +0200
>@@ -1,18 +1,16 @@
> Summary: A library of functions for manipulating PNG image format files
> Name: libpng
>-Version: 1.2.10
>-Release: 7
>-License: OSI certified
>+Epoch:         2
>+Version:       1.2.16
>+Release:       1.n0i.1
>+License:       BSD
> Group: System Environment/Libraries
> Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
>-Patch0: libpng-1.2.10-multilib.patch
>+Patch0:        libpng-1.2.16-multilib.patch
> Patch1: libpng-1.2.10-pngconf.patch
> Buildroot: %{_tmppath}/%{name}-%{version}-root
> BuildPrereq: zlib-devel
>-Provides: libpng.so.3
> URL: http://www.libpng.org/pub/png/
>-%define LIBVER 3.%{version}
>-Epoch: 2
> Conflicts: qt < 0:2.2.2
> 
> %description
>@@ -26,9 +24,9 @@
> files.
> 
> %package devel
>-Summary: Development tools for programs to manipulate PNG image format files.
>+Summary:       Development tools for programs to manipulate PNG image format files
> Group: Development/Libraries
>-Requires: libpng = %{epoch}:%{version}-%{release}, zlib-devel, pkgconfig
>+Requires:      libpng = %{epoch}:%{version}-%{release} zlib-devel pkgconfig
> 
> %description devel
> The libpng-devel package contains the header files and static
>@@ -46,15 +44,14 @@
> 
> %build
> %configure
>-make 
>+%{__make}
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>+%{__rm} -rf $RPM_BUILD_ROOT
> %makeinstall
>-# we keep the static libraries in the -devel package, since some 
>-# graphical boot packages need to link statically against libpng
>-rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng.la
>-rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
>+
>+%clean
>+%{__rm} -rf $RPM_BUILD_ROOT
> 
> %post -p /sbin/ldconfig
> 
>@@ -63,22 +60,28 @@
> %files
> %defattr(-,root,root)
> %doc *.txt example.c README TODO CHANGES LICENSE 
>-%{_libdir}/libpng*.so.*
>+%{_libdir}/*.so.*
> %{_mandir}/man5/*
> 
> %files devel
> %defattr(-,root,root)
> %{_bindir}/*
> %{_includedir}/*
>-%{_libdir}/libpng*.so
>-%{_libdir}/libpng*.a
>+%{_libdir}/*.so
>+%{_libdir}/*.a
>+%exclude %{_libdir}/*.la
> %{_libdir}/pkgconfig/*
> %{_mandir}/man3/*
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> %changelog
>+* Mon Feb 05 2007 Marius FERARU <altblue@n0i.net> - 2:1.2.16-1.n0i.1
>+- spec cleanup
>+- version 1.2.16
>+- updated multilib patch
>+- converted spec to utf-8
>+- fixed devel package summary
>+- switched to BSD license (libpng applies to zlib license)
>+
> * Mon Oct 02 2006 Jesse Keating <jkeating@redhat.com> - 2:1.2.10-7
> - Require pkgconfig in the -devel subpackage as it gets called by
>   /usr/bin/libpng-config
>@@ -239,7 +242,7 @@
> * Wed Sep 19 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.0-1
> - 1.2.0
> 
>-* Mon Jul 16 2001 Trond Eivind Glomsrød <teg@redhat.com>
>+* Mon Jul 16 2001 Trond Eivind GlomsrÃ¸d <teg@redhat.com>
> - s/Copyright/License/
> - fix weird versioning system (epoch was set to "2" in the main
>   package, serial to "1" in the devel package. Huh?)
>@@ -295,11 +298,11 @@
> * Fri Feb 11 2000 Nalin Dahyabhai <nalin@redhat.com>
> - move buildroot and add URL
> 
>-* Sat Feb  5 2000 Bernhard Rosenkränzer <bero@redhat.com>
>+* Sat Feb  5 2000 Bernhard RosenkrÃ¤nzer <bero@redhat.com>
> - strip library
> - rebuild to compress man pages
> 
>-* Sun Nov 21 1999 Bernhard Rosenkränzer <bero@redhat.com>
>+* Sun Nov 21 1999 Bernhard RosenkrÃ¤nzer <bero@redhat.com>
> - 1.0.5
> - some tweaks to spec file to make updating easier
> - handle RPM_OPT_FLAGS

Actions: View | Diff

Attachments on bug 227334: 147350 | 147351