rpms/optipng/devel .cvsignore, 1.3, 1.4 optipng.spec, 1.8, 1.9 sources, 1.3, 1.4 optipng-0.5.4-makefile-externlibs.patch, 1.1, NONE optipng-0.5.5-log.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/optipng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6683

Modified Files:
	.cvsignore optipng.spec sources 
Removed Files:
	optipng-0.5.4-makefile-externlibs.patch 
	optipng-0.5.5-log.patch 
Log Message:
* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.1-1
- 0.6.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/optipng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2007 17:18:30 -0000	1.3
+++ .cvsignore	28 Aug 2008 21:51:26 -0000	1.4
@@ -1 +1 @@
-optipng-0.5.5.tar.gz
+optipng-0.6.1.tar.gz


Index: optipng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- optipng.spec	13 Feb 2008 23:30:35 -0000	1.8
+++ optipng.spec	28 Aug 2008 21:51:26 -0000	1.9
@@ -1,15 +1,12 @@
 Name:           optipng
-Version:        0.5.5
-Release:        4%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
-# Patch0: http://sourceforge.net/tracker/index.php?func=detail&aid=1790969&group_id=151404&atid=780913
-Patch0:         optipng-0.5.5-log.patch
-Patch1:         optipng-0.5.4-makefile-externlibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -17,18 +14,21 @@
 %description
 OptiPNG is a PNG optimizer that recompresses image files to a smaller size,
 without losing any information. This program also converts external formats
-(BMP, GIF, PNM; TIFF support is coming up) to optimized PNG, and performs PNG
-integrity checks and corrections. 
+(BMP, GIF, PNM and TIFF) to optimized PNG, and performs PNG integrity checks
+and corrections.
 
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+
+# Ensure system libs and headers are used; as of 0.6.1 pngxtern will use
+# the bundled headers if present even with -with-system-*, causing failures.
+rm -rf lib/libpng lib/zlib
 
 %define makefile gcc.mak
 
 %build
+./configure -with-system-zlib -with-system-libpng
 cd src/
 make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
                                             LDFLAGS="$RPM_OPT_FLAGS"
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.1-1
+- 0.6.1.
+
 * Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.5-4
 - Apply sf.net patch #1790969 to fix crash with -log.
 - Cosmetic specfile changes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/optipng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2007 17:18:30 -0000	1.3
+++ sources	28 Aug 2008 21:51:26 -0000	1.4
@@ -1 +1 @@
-9dbc2bb39e39b6ab4ed0c705d8035bdf  optipng-0.5.5.tar.gz
+39c7a7b2ae4dd5544e4dedb419a5e902  optipng-0.6.1.tar.gz


--- optipng-0.5.4-makefile-externlibs.patch DELETED ---


--- optipng-0.5.5-log.patch DELETED ---