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
Add suppression to native multilib patch for pango
[fedora-mingw.git]
/
zlib
/
mingw-zlib.spec
diff --git
a/zlib/mingw-zlib.spec
b/zlib/mingw-zlib.spec
index
213f228
..
31c032e
100644
(file)
--- a/
zlib/mingw-zlib.spec
+++ b/
zlib/mingw-zlib.spec
@@
-1,8
+1,13
@@
-%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-zlib
Version: 1.2.3
Name: mingw-zlib
Version: 1.2.3
-Release:
5
%{?dist}
+Release:
8
%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
Summary: MinGW Windows zlib compression library
License: zlib
@@
-13,7
+18,7
@@
Patch1: zlib-win32.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >=
12
+BuildRequires: mingw-filesystem >=
23
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
@@
-50,22
+55,19
@@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir}/man3
make -f win32/Makefile.gcc \
INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw_libdir} \
make -f win32/Makefile.gcc \
INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw_libdir} \
+ BINARY_PATH=$RPM_BUILD_ROOT%{_mingw_bindir} \
install
install
-# DLL needs to go in the bin directory.
-mv $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll \
- $RPM_BUILD_ROOT%{_mingw_bindir}
-
# .dll.a file is misnamed for some reason - fix that.
mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
$RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll.a
# .dll.a file is misnamed for some reason - fix that.
mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
$RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll.a
-%__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
%clean
%clean
@@
-76,13
+78,17
@@
rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_mingw_includedir}/zconf.h
%{_mingw_includedir}/zlib.h
%defattr(-,root,root)
%{_mingw_includedir}/zconf.h
%{_mingw_includedir}/zlib.h
-%{_mingw_libdir}/libz.a
%{_mingw_libdir}/libz.dll.a
%{_mingw_libdir}/libz.dll.a
-%{_mingw_bindir}/libz.dll
-%{_mingw_mandir}/man3/zlib.3
+%{_mingw_bindir}/zlib1.dll
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
+- Remove manpage.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-7
+- Remove static library.
+
* Fri Sep 5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-5
- Fix misnamed file: zlibdll.a -> zlib.dll.a
- Explicitly provide mingw(zlib1.dll).
* Fri Sep 5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-5
- Fix misnamed file: zlibdll.a -> zlib.dll.a
- Explicitly provide mingw(zlib1.dll).