git.annexia.org
/
fedora-mingw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added extra overflow patch frrom native build
[fedora-mingw.git]
/
libpng
/
mingw-libpng.spec
diff --git
a/libpng/mingw-libpng.spec
b/libpng/mingw-libpng.spec
index
8407bc9
..
7e50225
100644
(file)
--- a/
libpng/mingw-libpng.spec
+++ b/
libpng/mingw-libpng.spec
@@
-1,21
+1,26
@@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
Name: mingw-libpng
Version: 1.2.31
Name: mingw-libpng
Version: 1.2.31
-Release:
1
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Libpng library
Summary: MinGW Windows Libpng library
-License: zlib
-URL: http://www.libpng.org/pub/png/
-Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
+License:
zlib
+URL:
http://www.libpng.org/pub/png/
+Source0:
ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >=
19
+BuildRequires: mingw-filesystem >=
23
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
+BuildRequires: mingw-zlib
%description
MinGW Windows Libpng library.
%description
MinGW Windows Libpng library.
@@
-34,6
+39,12
@@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
+
+# No need to distribute manpages which appear in the Fedora
+# native packages already.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-47,7
+58,6
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_includedir}/libpng12
%{_mingw_includedir}/png.h
%{_mingw_includedir}/pngconf.h
%{_mingw_includedir}/libpng12
%{_mingw_includedir}/png.h
%{_mingw_includedir}/pngconf.h
-%{_mingw_libdir}/libpng.a
%{_mingw_libdir}/libpng.dll.a
%{_mingw_libdir}/libpng.la
%{_mingw_libdir}/libpng12.a
%{_mingw_libdir}/libpng.dll.a
%{_mingw_libdir}/libpng.la
%{_mingw_libdir}/libpng12.a
@@
-55,10
+65,14
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_libdir}/libpng12.la
%{_mingw_libdir}/pkgconfig/libpng.pc
%{_mingw_libdir}/pkgconfig/libpng12.pc
%{_mingw_libdir}/libpng12.la
%{_mingw_libdir}/pkgconfig/libpng.pc
%{_mingw_libdir}/pkgconfig/libpng12.pc
-%{_mingw_mandir}/man3/libpng.3*
-%{_mingw_mandir}/man3/libpngpf.3*
-%{_mingw_mandir}/man5/png.5*
+
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-3
+- Don't duplicate Fedora native manpages.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
+- Remove static library.
+
* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-1
- Initial RPM release
* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-1
- Initial RPM release