packages: libpng12/libpng12.spec - libpng 1.2.x as alternative libpng

qboosh qboosh at pld-linux.org
Sun Jan 10 20:46:32 CET 2010 

Author: qboosh                       Date: Sun Jan 10 19:46:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libpng 1.2.x as alternative libpng

---- Files affected:
packages/libpng12:
   libpng12.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: packages/libpng12/libpng12.spec
diff -u packages/libpng12/libpng12.spec:1.175 packages/libpng12/libpng12.spec:1.176
--- packages/libpng12/libpng12.spec:1.175	Sun Jan 10 10:14:31 2010
+++ packages/libpng12/libpng12.spec	Sun Jan 10 20:46:26 2010
@@ -1,27 +1,21 @@
 # $Revision$, $Date$
-# NOTE: try to switch to ac/am/lt build on 1.2.x->1.4.x upgrade
-Summary:	PNG library
-Summary(de.UTF-8):	PNG-Library
-Summary(es.UTF-8):	Biblioteca PNG
-Summary(fr.UTF-8):	Librarie PNG
-Summary(pl.UTF-8):	Biblioteka PNG
-Summary(pt_BR.UTF-8):	Biblioteca PNG
-Summary(tr.UTF-8):	PNG kitaplığı
-Name:		libpng
+Summary:	PNG library version 1.2.x
+Summary(pl.UTF-8):	Biblioteka PNG w wersji 1.2.x
+Name:		libpng12
 Version:	1.2.42
 Release:	1
 Epoch:		2
 License:	distributable
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
+Source0:	http://downloads.sourceforge.net/libpng/libpng-%{version}.tar.xz
 # Source0-md5:	dcf4892946e2d6aab6e46d02ed774315
-Patch0:		%{name}-pngminus.patch
-Patch1:		%{name}-opt.patch
-Patch2:		%{name}-norpath.patch
-Patch3:		%{name}-export_old.patch
-Patch4:		%{name}-revert.patch
+Patch0:		libpng-pngminus.patch
+Patch1:		libpng-opt.patch
+Patch2:		libpng-norpath.patch
+Patch3:		libpng-export_old.patch
+Patch4:		libpng-revert.patch
 # http://littlesvr.ca/apng/
-Patch5:		%{name}-apng.patch
+Patch5:		libpng-apng.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	xz >= 1:4.999.7
@@ -31,7 +25,7 @@
 %else
 Provides:	libpng.so.3
 %endif
-Provides:	libpng(APNG) = 0.10
+Provides:	libpng12(APNG) = 0.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,115 +33,46 @@
 manipulate PNG format graphics files. The PNG format was designed as a
 replacement for GIF, with many improvements and extensions.
 
-%description -l de.UTF-8
-Die PNG-Library ist eine Sammlung von Routinen zum Erstellen und
-Bearbeiten von Grafiken im PNG-Format. Das PNG-Format wurde als Ersatz
-für GIF entwickelt und enthält viele Verbesserungen und Erweiterungen.
-
-%description -l es.UTF-8
-Esta biblioteca es una colección de rutinas para crear y manipular
-archivos gráficos en el formato PNG. Este formato fue proyectado para
-substituir el
-
-%description -l fr.UTF-8
-La librairie PNG est un ensemble de routines utilisées pour créer et
-manipuler des fichiers graphiques au format PNG. Le format PNG a été
-élaboré pour remplacer le GIF, avec de nombreuses améliorations et
-extensions.
+This package provides older 1.2.x series of library.
 
 %description -l pl.UTF-8
 Biblioteki PNG są kolekcją form używanych do tworzenia i manipulowania
 plikami w formacie graficznym PNG. Format ten został stworzony jako
 zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
 
-%description -l pt_BR.UTF-8
-Esta biblioteca é uma coleção de rotinas para criar e manipular
-arquivos gráficos no formato PNG. Este formato foi projetado para
-substituir o formato GIF, com extensões e melhorias.
-
-%description -l tr.UTF-8
-PNG kitaplığı, PNG formatındaki resim dosyalarını işlemeye yönelik
-yordamları içerir. PNG, GIF formatının yerini almak üzere tasarlanmış
-bir resim formatıdır.
+Ten pakiet dostarcza bibliotekę ze starszej serii 1.2.x.
 
 %package devel
-Summary:	Header files for libpng
-Summary(de.UTF-8):	libpng Headers
-Summary(es.UTF-8):	Archivos de inclusión y bibliotecas estáticas
-Summary(fr.UTF-8):	en-têtes et bibliothèques statiques
-Summary(pl.UTF-8):	Pliki nagłówkowe libpng
-Summary(pt_BR.UTF-8):	Arquivos de inclusão e bibliotecas estáticas
-Summary(tr.UTF-8):	başlık dosyaları ve statik kitaplıklar
+Summary:	Header files for libpng 1.2.x
+Summary(pl.UTF-8):	Pliki nagłówkowe libpng 1.2.x
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	zlib-devel
-Provides:	libpng(APNG)-devel = 0.10
-Conflicts:	libpng < 1.0.15
+Provides:	libpng12(APNG)-devel = 0.10
 
 %description devel
 The header files are only needed for development of programs using the
-PNG library.
-
-%description devel -l de.UTF-8
-Die Header-Dateien werden nur zur Entwicklung von Programmen mit der
-PNG-Library benötigt.
-
-%description devel -l es.UTF-8
-Archivos de inclusión y bibliotecas estáticas que son necesarios
-solamente para el desarrollo de programas que usan la biblioteca PNG.
-
-%description devel -l fr.UTF-8
-Fichiers d'en-tete et les librairies qui sont requis seulement pour le
-développement avec la librairie PNG.
+PNG library version 1.2.x.
 
 %description devel -l pl.UTF-8
 W pakiecie tym znajdują się pliki nagłówkowe, przeznaczone dla
-programistów używających bibliotek PNG.
-
-%description devel -l pt_BR.UTF-8
-Arquivos de inclusão e bibliotecas estáticas que são necessários
-somente para o desenvolvimento de programas que usam a biblioteca PNG.
-
-%description devel -l tr.UTF-8
-PNG kitaplığını kullanan programlar geliştirmek için gereken
-kitaplıklar ve başlık dosyaları.
+programistów używających biblioteki PNG w wersji 1.2.x.
 
 %package static
-Summary:	Static PNG libraries
-Summary(de.UTF-8):	Statischen PNG Libraries
-Summary(pl.UTF-8):	Biblioteki statyczne PNG
-Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com libpng
+Summary:	Static PNG library version 1.2.x
+Summary(pl.UTF-8):	Biblioteka statyczna PNG w wersji 1.2.x
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Provides:	libpng(APNG)-static = 0.10
+Provides:	libpng12(APNG)-static = 0.10
 
 %description static
-Static PNG libraries.
-
-%description static -l de.UTF-8
-Statischen PNG Libraries.
+Static PNG library version 1.2.x.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne PNG.
-
-%description static -l pt_BR.UTF-8
-Bibliotecas estáticas para desenvolvimento com libpng.
-
-%package progs
-Summary:	libpng utility programs
-Summary(pl.UTF-8):	Narzędzia do plików PNG
-Group:		Applications/Graphics
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description progs
-This package contains utility programs to convert PNG files to and
-from PNM files.
-
-%description progs -l pl.UTF-8
-Narzędzia do konwersji plików PNG z lub do plików PNM.
+Biblioteka statyczna PNG w wersji 1.2.x.
 
 %prep
-%setup -q -c -T
+%setup -q -c -T -n libpng-%{version}
 xzcat -dc %{SOURCE0} | tar xf - -C ..
 %patch0 -p1
 %patch1 -p1
@@ -173,11 +98,6 @@
 	OPT_FLAGS="%{rpmcflags}"
 %endif
 
-%{__make} -C contrib/pngminus -f makefile.std \
-	LIBPATH=%{_libdir} \
-	CC="%{__cc}" \
-	OPT_FLAGS="%{rpmcflags}"
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man{3,5}} \
@@ -189,8 +109,13 @@
 	LIBPATH=%{_libdir} \
 	MANPATH=%{_mandir}
 
-install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
-install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# these come from libpng (1.4.x) now
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/libpng-config \
+	$RPM_BUILD_ROOT%{_includedir}/png*.h \
+	$RPM_BUILD_ROOT%{_libdir}/libpng.{so,a} \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}/libpng.pc
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/libpng \
+	$RPM_BUILD_ROOT%{_mandir}/man[35]
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -211,25 +136,13 @@
 %defattr(644,root,root,755)
 %doc *.txt
 %attr(755,root,root) %{_bindir}/libpng12-config
-%attr(755,root,root) %{_bindir}/libpng-config
 %attr(755,root,root) %{_libdir}/libpng12.so
-%attr(755,root,root) %{_libdir}/libpng.so
 %{_pkgconfigdir}/libpng12.pc
-%{_pkgconfigdir}/libpng.pc
 %{_includedir}/libpng12
-%{_includedir}/libpng
-%{_includedir}/png*.h
-%{_mandir}/man?/*
-%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpng12.a
-%{_libdir}/libpng.a
-
-%files progs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/p*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -237,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2010/01/10 19:46:26  qboosh
+- libpng 1.2.x as alternative libpng
+
 Revision 1.175  2010/01/10 09:14:31  qboosh
 - updated to 1.2.42
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng12/libpng12.spec?r1=1.175&r2=1.176&f=u

More information about the pld-cvs-commit mailing list