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
mingw -> mingw32 rename and miscellanous related fixes.
[fedora-mingw.git]
/
zlib
/
mingw32-zlib.spec
diff --git
a/zlib/mingw-zlib.spec
b/zlib/mingw32-zlib.spec
similarity index 52%
rename from
zlib/mingw-zlib.spec
rename to
zlib/mingw32-zlib.spec
index
31c032e
..
d43344c
100644
(file)
--- a/
zlib/mingw-zlib.spec
+++ b/
zlib/mingw32-zlib.spec
@@
-1,13
+1,12
@@
-
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw
32
_findrequires}
+%define __find_provides %{_mingw
32
_findprovides}
-Name: mingw-zlib
+Name: mingw
32
-zlib
Version: 1.2.3
Version: 1.2.3
-Release:
8
%{?dist}
+Release:
9
%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
Summary: MinGW Windows zlib compression library
License: zlib
@@
-18,12
+17,12
@@
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 >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw
32
-filesystem >= 23
+BuildRequires: mingw
32
-gcc
+BuildRequires: mingw
32
-binutils
-#
For some reason mingw
-find-provides doesn't get this.
-
Provides: mingw
(zlib1.dll)
+#
# For some reason mingw32
-find-provides doesn't get this.
+
#Provides: mingw32
(zlib1.dll)
%description
MinGW Windows zlib compression library.
%description
MinGW Windows zlib compression library.
@@
-35,39
+34,39
@@
MinGW Windows zlib compression library.
%build
%build
-CC=%{_mingw_cc} \
-CFLAGS="%{_mingw_cflags}" \
-RANLIB=%{_mingw_ranlib} \
+CC=%{_mingw
32
_cc} \
+CFLAGS="%{_mingw
32
_cflags}" \
+RANLIB=%{_mingw
32
_ranlib} \
./configure
make -f win32/Makefile.gcc \
./configure
make -f win32/Makefile.gcc \
- CC=%{_mingw_cc} \
- AR=%{_mingw_ar} \
+ CC=%{_mingw
32
_cc} \
+ AR=%{_mingw
32
_ar} \
RC=i686-pc-mingw32-windres \
DLLWRAP=i686-pc-mingw32-dllwrap \
RC=i686-pc-mingw32-windres \
DLLWRAP=i686-pc-mingw32-dllwrap \
- STRIP=%{_mingw_strip} \
+ STRIP=%{_mingw
32
_strip} \
all
%install
rm -rf $RPM_BUILD_ROOT
all
%install
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
32
_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw
32
_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw
32
_libdir}
make -f win32/Makefile.gcc \
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} \
+ INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw
32
_includedir} \
+ LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw
32
_libdir} \
+ BINARY_PATH=$RPM_BUILD_ROOT%{_mingw
32
_bindir} \
install
# .dll.a file is misnamed for some reason - fix that.
install
# .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
+mv $RPM_BUILD_ROOT%{_mingw
32
_libdir}/libzdll.a \
+ $RPM_BUILD_ROOT%{_mingw
32
_libdir}/libz.dll.a
# Remove static library.
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
+rm $RPM_BUILD_ROOT%{_mingw
32
_libdir}/libz.a
%clean
%clean
@@
-76,13
+75,16
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
-%{_mingw_includedir}/zconf.h
-%{_mingw_includedir}/zlib.h
-%{_mingw_libdir}/libz.dll.a
-%{_mingw_bindir}/zlib1.dll
+%{_mingw
32
_includedir}/zconf.h
+%{_mingw
32
_includedir}/zlib.h
+%{_mingw
32
_libdir}/libz.dll.a
+%{_mingw
32
_bindir}/zlib1.dll
%changelog
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-9
+- Rename mingw -> mingw32.
+
* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
- Remove manpage.
* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
- Remove manpage.