- argh, reverted two stupid ideas: removing "-lz -lm" from libpng linking and

  installing two separate copies of identical code with different SONAME
  (revert patch)
- release 0.2

Changed files:
    libpng-revert.patch -> 1.1
    libpng.spec -> 1.69

diff --git a/libpng-revert.patch b/libpng-revert.patch
new file mode 100644 (file)
index 0000000..8a1493d
--- /dev/null
+++ b/libpng-revert.patch
@@ -0,0 +1,66 @@
+diff -Nur libpng-1.2.5.orig/scripts/makefile.gcmmx libpng-1.2.5/scripts/makefile.gcmmx
+--- libpng-1.2.5.orig/scripts/makefile.gcmmx   Sat Oct 12 01:00:37 2002
++++ libpng-1.2.5/scripts/makefile.gcmmx        Sat Oct 12 01:05:56 2002
+@@ -125,14 +125,12 @@
+       ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+ 
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+-      $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
++      $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \
+       -o $(LIBNAME).so.$(PNGVER) \
+       $(OBJSDLL)
+ 
+-libpng.so.3.$(PNGMIN): $(OBJSDLL)
+-      $(CC) -shared -Wl,-soname,libpng.so.3 \
+-      -o libpng.so.3.$(PNGMIN) \
+-      $(OBJSDLL)
++libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER)
++      ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+       $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+@@ -174,10 +172,9 @@
+       -@/bin/rm -f $(DL)/libpng.so.3
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+       cp $(LIBNAME).so.$(PNGVER) $(DL)
+-      cp libpng.so.3.$(PNGMIN) $(DL)
+       chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+-      chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+       (cd $(DL); \
++      ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
+       ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
+diff -Nur libpng-1.2.5.orig/scripts/makefile.linux libpng-1.2.5/scripts/makefile.linux
+--- libpng-1.2.5.orig/scripts/makefile.linux   Sat Oct 12 01:00:37 2002
++++ libpng-1.2.5/scripts/makefile.linux        Sat Oct 12 01:05:55 2002
+@@ -97,14 +97,12 @@
+       ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+ 
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+-      $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
++      $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \
+       -o $(LIBNAME).so.$(PNGVER) \
+       $(OBJSDLL)
+ 
+-libpng.so.3.$(PNGMIN): $(OBJSDLL)
+-      $(CC) -shared -Wl,-soname,libpng.so.3 \
+-      -o libpng.so.3.$(PNGMIN) \
+-      $(OBJSDLL)
++libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER)
++      ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+       $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+@@ -146,10 +144,9 @@
+       -@/bin/rm -f $(DL)/libpng.so.3
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+       cp $(LIBNAME).so.$(PNGVER) $(DL)
+-      cp libpng.so.3.$(PNGMIN) $(DL)
+       chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+-      chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+       (cd $(DL); \
++      ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
+       ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \

diff --git a/libpng.spec b/libpng.spec
index 595b47b56d5b28410d9edd419f8fe094739dfd43..4d832b9e1fac2b5a5d71c40ab0d7366aa5d89ce0 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -7,7 +7,7 @@ Summary(pt_BR): Biblioteca PNG
 Summary(tr):   PNG kitaplýðý
 Name:          libpng
 Version:       1.2.5
-Release:       0.1
+Release:       0.2
 Epoch:         2
 License:       distributable
 Group:         Libraries
@@ -15,8 +15,9 @@ Source0:      ftp://download.sourceforge.net/pub/sourceforge/libpng/%{name}-%{version
 Patch0:                %{name}-pngminus.patch
 Patch1:                %{name}-badchunks.patch
 Patch2:                %{name}-opt.patch
-BuildRequires: zlib-devel
+Patch3:                %{name}-revert.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -136,6 +137,7 @@ Narz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %ifarch %{ix86}
 ln -sf scripts/makefile.gcmmx ./Makefile
@@ -169,11 +171,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ANNOUNCE CHANGES KNOWNBUG README
 %attr(755,root,root) %{_libdir}/*.so.*.*
+%{_libdir}/libpng.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%doc  *.txt ANNOUNCE CHANGES KNOWNBUG README
+%doc *.txt
 %attr(755,root,root) %{_bindir}/libpng*-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_pkgconfigdir}/*