rpms/libpng10/devel libpng-1.0.20-rhconf.patch, NONE, 1.1 libpng10.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Thu Jul 20 07:21:50 UTC 2006
Author: pghmcfc
Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14533/devel
Modified Files:
.cvsignore sources
Added Files:
libpng-1.0.20-rhconf.patch libpng10.spec
Log Message:
auto-import libpng10-1.0.20-1 on branch devel from libpng10-1.0.20-1.src.rpm
libpng-1.0.20-rhconf.patch:
--- NEW FILE libpng-1.0.20-rhconf.patch ---
--- libpng-1.0.20/scripts/makefile.linux.rhconf 2006-06-27 21:20:55.000000000 +0100
+++ libpng-1.0.20/scripts/makefile.linux 2006-07-08 10:36:52.000000000 +0100
@@ -4,18 +4,16 @@
# For conditions of distribution and use, see copyright notice in png.h
# Library name:
-LIBNAME = libpng10
-PNGMAJ = 0
+LINK_SUFFIX = 10
+LIBNAME = libpng
+PNGMAJ = 2
PNGMIN = 1.0.20
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
-LIBSO=$(LIBNAME).so
+LIBSO=$(LIBNAME)$(LINK_SUFFIX).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
-OLDSO=libpng.so
-OLDSOMAJ=libpng.so.2
-OLDSOVER=libpng.so.2.$(PNGMIN)
# Utilities:
AR_RC=ar rc
@@ -28,14 +26,19 @@
# where "make install" puts libpng10.a, libpng10.so*,
# libpng10/png.h and libpng10/pngconf.h
# Prefix must be a full pathname.
-prefix=/usr/local
+prefix=/usr
exec_prefix=$(prefix)
+INCPATH=$(prefix)/include
+LIBPATH=$(exec_prefix)/lib
+MANPATH=$(prefix)/share/man
+BINPATH=$(exec_prefix)/bin
+
# Where the zlib library and include files are located.
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
++ZLIBLIB=$(LIBPATH)
++ZLIBINC=$(INCPATH)
ALIGN=
# for i386:
@@ -47,16 +50,11 @@
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+CFLAGS=-Wall $(RPM_OPT_FLAGS) \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng$(LINK_SUFFIX).a -lz -lm
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
@@ -84,14 +82,20 @@
.c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
+all: libpng$(LINK_SUFFIX).a $(LIBNAME)$(LINK_SUFFIX).so pngtest pngtest-static libpng.pc
-libpng.a: $(OBJS)
+libpng$(LINK_SUFFIX).a: $(OBJS)
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
- cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+ sed -e 's, at prefix@,$(prefix),' \
+ -e 's, at exec_prefix@,$${prefix},' \
+ -e 's, at libdir@,$(LIBPATH),' \
+ -e 's, at includedir@.*,$${exec_prefix}/include,' \
+ -e 's,^Name: .*,Name: libpng10,' \
+ -e 's,^Cflags: .*,Cflags: -I$${includedir}/libpng10,' \
+ scripts/libpng.pc.in > libpng.pc
libpng-config:
( cat scripts/libpng-config-head.in; \
@@ -112,15 +116,10 @@
$(LIBSOVER): $(OBJSDLL)
$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
-$(OLDSOVER): $(OBJSDLL)
- $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
- -o $(OLDSOVER) \
- $(OBJSDLL)
-
pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-pngtest-static: pngtest.o libpng.a
+pngtest-static: pngtest.o libpng$(LINK_SUFFIX).a
$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
test: pngtest pngtest-static
@@ -135,43 +134,28 @@
install-headers: png.h pngconf.h
- at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+ - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME)$(LINK_SUFFIX); fi
+ cp png.h pngconf.h $(DI)/$(LIBNAME)$(LINK_SUFFIX)
+ chmod 644 $(DI)/$(LIBNAME)$(LINK_SUFFIX)/png.h $(DI)/$(LIBNAME)$(LINK_SUFFIX)/pngconf.h
install-static: install-headers libpng.a
- at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+ cp libpng.a $(DL)/$(LIBNAME)$(LINK_SUFFIX).a
+ chmod 644 $(DL)/$(LIBNAME)$(LINK_SUFFIX).a
-install-shared: install-headers $(LIBSOVER) libpng.pc \
- $(OLDSOVER)
+install-shared: install-headers $(LIBSOVER) libpng.pc
- at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
- -@$(RM_F) $(DL)/$(OLDSO)
- -@$(RM_F) $(DL)/$(OLDSOMAJ)
- -@$(RM_F) $(DL)/$(OLDSOVER)*
cp $(LIBSOVER) $(DL)
- cp $(OLDSOVER) $(DL)
chmod 755 $(DL)/$(LIBSOVER)
- chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
- $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
- $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
- at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+ -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME)$(LINK_SUFFIX).pc
+ cp libpng.pc $(DL)/pkgconfig/$(LIBNAME)$(LINK_SUFFIX).pc
+ chmod 644 $(DL)/pkgconfig/$(LIBNAME)$(LINK_SUFFIX).pc
install-man: libpng.3 libpngpf.3 png.5
- at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
@@ -192,7 +176,7 @@
chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-install: install-static install-shared install-man install-config
+install: install-shared
# If you installed in $(DESTDIR), test-installed won't work until you
# move the library to its final location. Use test-dd to test it
@@ -217,7 +201,6 @@
clean:
$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
- $(OLDSOVER) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
--- NEW FILE libpng10.spec ---
Summary: Old version of libpng, needed to run old binaries
Name: libpng10
Version: 1.0.20
Release: 1%{?dist}
License: zlib License
Group: System Environment/Libraries
URL: http://www.libpng.org/pub/png/libpng.html
Source: ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
Patch0: libpng-1.0.20-rhconf.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
Conflicts: libpng < 2:1.2.0
%description
The libpng10 package contains an old version of libpng, a library of functions
for creating and manipulating PNG (Portable Network Graphics) image format
files.
This package is needed if you want to run binaries that were linked dynamically
with libpng 1.0.x.
%package devel
Group: Development/Libraries
Summary: Development tools for version 1.0 of libpng
Requires: libpng10 = %{version}-%{release}, zlib-devel, pkgconfig
%description devel
The libpng10-devel package contains the header files necessary for developing
programs using version 1.0 of the PNG (Portable Network Graphics) library.
If you want to develop programs that will manipulate PNG image format files,
while still running on previous old Linux releases, you should install
libpng10-devel.
%prep
%setup -q -n libpng-%{version}
%{__ln_s} scripts/makefile.linux Makefile
%patch0 -p1 -b .rhconf
%build
%{__make} RPM_OPT_FLAGS="%{optflags}" LIBPATH=%{_libdir} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} LIBPATH=%{_libdir} install
# Install docs
# This is done manually so that the docs, which are all in the same directory,
# can be split between the main and devel package. If the %doc macro is used
# in the files list with a non-absolute path, it clears out the docs directory
# first, which means the splitting of docs into two packages won't work.
# The alternative would be to have the devel docs in a different directory,
# but I don't want to do that.
%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
# Docs for main package
%{__install} -p -m 644 README TODO CHANGES LICENSE Y2KINFO \
%{buildroot}%{_docdir}/%{name}-%{version}/
# Docs for devel package
%{__install} -p -m 644 example.c libpng.txt \
%{buildroot}%{_docdir}/%{name}-%{version}/
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,755)
%doc %{_docdir}/%{name}-%{version}/CHANGES
%doc %{_docdir}/%{name}-%{version}/LICENSE
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/TODO
%doc %{_docdir}/%{name}-%{version}/Y2KINFO
%{_libdir}/libpng.so.*
%files devel
%defattr(-,root,root)
%doc %{_docdir}/%{name}-%{version}/example.c
%doc %{_docdir}/%{name}-%{version}/libpng.txt
%{_includedir}/libpng10/
%{_libdir}/libpng10.so
%{_libdir}/pkgconfig/libpng10.pc
%changelog
* Thu Jul 6 2006 Paul Howarth <paul at city-fan.org> 1.0.20-1
- update to 1.0.20
- use Fedora Extras standard buildroot
- update URL
- include release in fully versioned dependency between devel and main pkgs
- wrap description text at 80 columns
- don't build static libraries
- devel package requires pkgconfig
- unpack tarball quietly
- update rhconf patch
- move doc files libpng.txt and example.c to devel package
- add doc Y2KINFO
- changed license tag from "OSI Certified" to "zlib License"
(see http://www.opensource.org/licenses/zlib-license.php)
- minor cosmetic spec file changes
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.18-3.2.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.18-3.2
- rebuilt for new gcc4.1 snapshot and glibc changes
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
* Sun Jul 31 2005 Florian La Roche <laroche at redhat.com>
- build with newest rpm, rm -f libpng.so
* Wed Mar 2 2005 Matthias Clasen <mclasen at redhat.com> - 1.0.18-2
- Rebuild with gcc4
* Mon Dec 06 2004 Matthias Clasen <mclasen at redhat.com> - 1.0.18-1
- Update to 1.0.18
* Tue Aug 17 2004 Matthias Clasen <mclasen at redhat.com> - 1.0.16-1
- Update to 1.0.16
- Combine rhconf patches
- Include LICENSE
* Wed Aug 4 2004 Matthias Clasen <mclasen at redhat.com> 1.0.15-9
- Build for FC3
* Fri Jul 23 2004 Matthias Clasen <mclasen at redhat.com> 1.0.15-8
- Build for FC2
* Fri Jul 23 2004 Matthias Clasen <mclasen at redhat.com> 1.0.15-7
- Replace the patches for individual security problems with the
cumulative patch issued by the png developers.
- Build for FC1
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Jun 14 2004 Matthias Clasen <mclasen at redhat.com> - 1.0.15-5
- Rebuilt for FC2
* Mon Jun 14 2004 Matthias Clasen <mclasen at redhat.com> - 1.0.15-4
- Rebuilt for FC1
* Mon Jun 14 2004 Matthias Clasen <mclasen at redhat.com> - 1.0.15-3
- Reinstate and improve the transfix patch which got lost sometime ago,
but is still needed for CAN-2002-1363 (#125934)
* Wed May 19 2004 Matthias Clasen <mclasen at redhat.com> 1.0.15-2
- Don't provide libpng-devel (#110161)
* Wed May 19 2004 Matthias Clasen <mclasen at redhat.com> 1.0.15-1
- 1.0.15
- Update rhconf2 patch
- Remove bogus badchunks patch (#89854)
* Mon May 03 2004 Matthias Clasen <mclasen at redhat.com> 1.0.13-13
- Redo the out-of-bounds fix in a slightly better way.
* Wed Apr 21 2004 Matthias Clasen <mclasen at redhat.com> 1.0.13-12
- Bump release number to disambiguate n-v-rs.
* Mon Apr 19 2004 Matthias Clasen <mclasen at redhat.com>
- fix a possible out-of-bounds read in the error message
handler. #121229
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Jun 9 2003 Elliot Lee <sopwith at redhat.com>
- This package has no epochs! remove usage thereof
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Jun 3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Wed Jan 15 2003 Elliot Lee <sopwith at redhat.com> 1.0.13-7
- Bump & rebuild
* Fri Dec 13 2002 Elliot Lee <sopwith at redhat.com> 1.0.13-6
- Rebuild, merging in multilib change
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Sun May 26 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 21 2002 Elliot Lee <sopwith at redhat.com> 1.0.13-3
- The package totally broke the backwards compatibility that it was intended to provide.
Fixed by setting soname to libpng.so.2, and only tweaking the build (libpng*.{so,a}) files.
- Use _smp_mflags
- Fix rhconf patch because it was patching a symlink instead of the actual file.
- Don't provide libpng = {version}, because then the package conflicts with itself
* Thu May 9 2002 Jeremy Katz <katzj at redhat.com> 1.0.13-2
- rebuild
* Thu May 2 2002 Havoc Pennington <hp at redhat.com> 1.0.13-1
- upgrade to 1.0.13, plus patch tarball from libpng web site
- update rhconf patch to work with new makefiles
* Mon Mar 4 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.12-6
- Revert fix for #59988 as it introduces a worse problem, #60410
* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.12-5
- Conflict with libpng < 1.2.0 (#59988)
* Wed Jan 30 2002 Bill Nottingham <notting at redhat.com> 1.0.12-4
- provide libpng = %%{version}, libpng-devel = %%{version}
* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Fri Jan 4 2002 Bill Nottingham <notting at redhat.com> 1.0.12-2
- add devel stuff (we may change this around later)
* Wed Sep 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.12-1
- initial compat package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2006 07:20:09 -0000 1.1
+++ .cvsignore 20 Jul 2006 07:21:50 -0000 1.2
@@ -0,0 +1 @@
+libpng-1.0.20.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2006 07:20:09 -0000 1.1
+++ sources 20 Jul 2006 07:21:50 -0000 1.2
@@ -0,0 +1 @@
+7c2fb566d3e5e70c8a5eeb719e67f26b libpng-1.0.20.tar.bz2
More information about the fedora-extras-commits
mailing list