[mingw32-pdcurses] Use the correct toolchain tools in the patch
by Erik van Pienbroek
commit 186c683e19595dd094e395b499812523cf2f3912
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Feb 27 21:11:41 2012 +0100
Use the correct toolchain tools in the patch
mingw32-pdcurses-3.4-build.patch | 4 ++--
mingw32-pdcurses.spec | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-pdcurses-3.4-build.patch b/mingw32-pdcurses-3.4-build.patch
index 6f87f8f..d111632 100644
--- a/mingw32-pdcurses-3.4-build.patch
+++ b/mingw32-pdcurses-3.4-build.patch
@@ -16,7 +16,7 @@
ifeq ($(DLL),Y)
CFLAGS += -DPDC_DLL_BUILD
- LIBEXE = gcc $(DEFFILE)
-+ LIBEXE = i686-pc-mingw32-gcc $(DEFFILE)
++ LIBEXE = i686-w64-mingw32-gcc $(DEFFILE)
LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
LIBCURSES = pdcurses.dll
LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
@@ -33,7 +33,7 @@
demos: $(DEMOS)
- strip *.exe
-+ i686-pc-mingw32-strip *.exe
++ i686-w64-mingw32-strip *.exe
$(DEFFILE): $(DEFDEPS)
echo LIBRARY pdcurses > $@
diff --git a/mingw32-pdcurses.spec b/mingw32-pdcurses.spec
index 1639986..e228cc3 100644
--- a/mingw32-pdcurses.spec
+++ b/mingw32-pdcurses.spec
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Feb 27 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 3.4-10
- Rebuild against the mingw-w64 toolchain
+- Use the correct toolchain tools in the patch
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
[mingw32-dlfcn] Fixed the build with the mingw-w64 toolchain
by Kalev Lember
commit 39e8d52559e7095b86d6f0456ba178c41a13e2ac
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Mon Feb 27 22:07:50 2012 +0200
Fixed the build with the mingw-w64 toolchain
dlfcn-fix-static-lib.patch | 4 ++--
dlfcn_configure.patch | 8 ++++----
mingw32-dlfcn.spec | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/dlfcn-fix-static-lib.patch b/dlfcn-fix-static-lib.patch
index b7cdabb..28b9ca4 100644
--- a/dlfcn-fix-static-lib.patch
+++ b/dlfcn-fix-static-lib.patch
@@ -6,8 +6,8 @@
libdl.a: dlfcn.o
- ar cru libdl.a dlfcn.o
- ranlib libdl.a
-+ i686-pc-mingw32-ar cru libdl.a dlfcn.o
-+ i686-pc-mingw32-ranlib libdl.a
++ i686-w64-mingw32-ar cru libdl.a dlfcn.o
++ i686-w64-mingw32-ranlib libdl.a
libdl.dll: dlfcn.o
$(CC) $(SHFLAGS) -shared -o libdl.dll dlfcn.o
diff --git a/dlfcn_configure.patch b/dlfcn_configure.patch
index 8a0e7db..2bfb062 100644
--- a/dlfcn_configure.patch
+++ b/dlfcn_configure.patch
@@ -3,10 +3,10 @@ diff -ruNp dlfcn-win32-r11/config.mak dlfcn-win32-r11.new/config.mak
+++ dlfcn-win32-r11.new/config.mak 2009-01-02 12:08:15.000000000 -0200
@@ -0,0 +1,9 @@
+# Automatically generated by configure
-+PREFIX=/usr/i686-pc-mingw32/sys-root/mingw
-+libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
-+incdir=/usr/i686-pc-mingw32/sys-root/mingw/include
-+CC=i686-pc-mingw32-gcc
++PREFIX=/usr/i686-w64-mingw32/sys-root/mingw
++libdir=/usr/i686-w64-mingw32/sys-root/mingw/lib
++incdir=/usr/i686-w64-mingw32/sys-root/mingw/include
++CC=i686-w64-mingw32-gcc
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+BUILD_MSVC=no
diff --git a/mingw32-dlfcn.spec b/mingw32-dlfcn.spec
index 3ca563a..55c6deb 100644
--- a/mingw32-dlfcn.spec
+++ b/mingw32-dlfcn.spec
@@ -60,10 +60,10 @@ Static version of the MinGW Windows dlfcn library.
%build
%{_mingw32_configure} \
--incdir=%{_mingw32_includedir} \
- --cc=i686-pc-mingw32-gcc \
+ --cc=i686-w64-mingw32-gcc \
--enable-shared=yes \
--enable-static=yes \
- --enable-strip=i686-pc-mingw32-strip
+ --enable-strip=i686-w64-mingw32-strip
make %{?_smp_mflags}
12 years, 2 months
[mingw32-zlib/f17] Remove the .la files
by Kalev Lember
commit d722a5c6c110c0f54cfb1aef841a3be13af4640e
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Mon Feb 27 22:04:16 2012 +0200
Remove the .la files
... and spec clean up.
mingw32-zlib.spec | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/mingw32-zlib.spec b/mingw32-zlib.spec
index 7e39d45..771caa4 100644
--- a/mingw32-zlib.spec
+++ b/mingw32-zlib.spec
@@ -1,13 +1,10 @@
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-zlib
Version: 1.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
@@ -21,10 +18,9 @@ Patch4: zlib-1.2.5-gentoo.patch
# The .def file contains an empty LIBRARY line which isn't valid
Patch5: zlib-1.2.5-use-correct-def-file.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: perl
@@ -100,39 +96,30 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}
rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/
install -m 644 x/zlib.pc $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_mingw32_includedir}/zconf.h
%{_mingw32_includedir}/zlib.h
%{_mingw32_libdir}/libz.dll.a
%{_mingw32_bindir}/zlib1.dll
-%{_mingw32_libdir}/libz.la
%{_mingw32_libdir}/pkgconfig/zlib.pc
%files static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libz.a
%files -n mingw32-minizip
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libminizip.dll.a
-%{_mingw32_libdir}/libminizip.la
%{_mingw32_bindir}/libminizip-1.dll
%dir %{_mingw32_includedir}/minizip
%{_mingw32_includedir}/minizip/*.h
@@ -140,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 1.2.5-8
+- Remove the .la files
+- Spec clean up
+
* Mon Feb 27 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.2.5-7
- Rebuild against the mingw-w64 toolchain
- Use the correct RPM macros
12 years, 2 months
[mingw32-zlib] Remove the .la files
by Kalev Lember
commit e959d46b63a450ebf270544ea39aff7d7f816626
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Mon Feb 27 22:04:16 2012 +0200
Remove the .la files
... and spec clean up.
mingw32-zlib.spec | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/mingw32-zlib.spec b/mingw32-zlib.spec
index 7e39d45..771caa4 100644
--- a/mingw32-zlib.spec
+++ b/mingw32-zlib.spec
@@ -1,13 +1,10 @@
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-zlib
Version: 1.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
@@ -21,10 +18,9 @@ Patch4: zlib-1.2.5-gentoo.patch
# The .def file contains an empty LIBRARY line which isn't valid
Patch5: zlib-1.2.5-use-correct-def-file.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: perl
@@ -100,39 +96,30 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}
rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/
install -m 644 x/zlib.pc $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_mingw32_includedir}/zconf.h
%{_mingw32_includedir}/zlib.h
%{_mingw32_libdir}/libz.dll.a
%{_mingw32_bindir}/zlib1.dll
-%{_mingw32_libdir}/libz.la
%{_mingw32_libdir}/pkgconfig/zlib.pc
%files static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libz.a
%files -n mingw32-minizip
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libminizip.dll.a
-%{_mingw32_libdir}/libminizip.la
%{_mingw32_bindir}/libminizip-1.dll
%dir %{_mingw32_includedir}/minizip
%{_mingw32_includedir}/minizip/*.h
@@ -140,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 1.2.5-8
+- Remove the .la files
+- Spec clean up
+
* Mon Feb 27 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.2.5-7
- Rebuild against the mingw-w64 toolchain
- Use the correct RPM macros
12 years, 2 months
[mingw32-zlib/f17: 2/2] Merge branch 'master' into f17
by Erik van Pienbroek
commit edf72897cc075672ebe5359e8f0ec1a817371cc3
Merge: a5cd572 cc83bfe
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Feb 27 20:48:35 2012 +0100
Merge branch 'master' into f17
mingw32-zlib.spec | 10 ++++++++--
zlib-1.2.5-use-correct-def-file.patch | 8 ++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
---
12 years, 2 months
[mingw32-zlib] Fix invalid .def file and use correct RPM macros
by Erik van Pienbroek
commit cc83bfe58317d043d50f3af538fb3f331fb4a8c5
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Feb 27 20:48:04 2012 +0100
Fix invalid .def file and use correct RPM macros
Use the correct RPM macros
Fix FTBFS against the latest binutils caused by the use of an invalid .def file
mingw32-zlib.spec | 10 ++++++++--
zlib-1.2.5-use-correct-def-file.patch | 8 ++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-zlib.spec b/mingw32-zlib.spec
index 7937e74..7e39d45 100644
--- a/mingw32-zlib.spec
+++ b/mingw32-zlib.spec
@@ -18,6 +18,9 @@ Source0: http://www.zlib.net/zlib-%{version}.tar.gz
Patch3: mingw32-zlib-1.2.5-autotools.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=591317
Patch4: zlib-1.2.5-gentoo.patch
+# The .def file contains an empty LIBRARY line which isn't valid
+Patch5: zlib-1.2.5-use-correct-def-file.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -55,6 +58,7 @@ MinGW Minizip manipulates files from a .zip archive.
%prep
%setup -q -n zlib-%{version}
+%patch5 -p1 -b .def
cd ..
cp -a zlib-%{version} x
mv x zlib-%{version}
@@ -76,8 +80,8 @@ make -f win32/Makefile.gcc \
CFLAGS="%{_mingw32_cflags}" \
CC=%{_mingw32_cc} \
AR=%{_mingw32_ar} \
- RC=i686-pc-mingw32-windres \
- DLLWRAP=i686-pc-mingw32-dllwrap \
+ RC=%{_mingw32_windres} \
+ DLLWRAP=%{_mingw32_dllwrap} \
STRIP=%{_mingw32_strip} \
all
popd
@@ -138,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Feb 27 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.2.5-7
- Rebuild against the mingw-w64 toolchain
+- Use the correct RPM macros
+- Fix FTBFS against the latest binutils caused by the use of an invalid .def file
* Fri Feb 17 2012 David Tardon <dtardon(a)redhat.com> - 1.2.5-6
- fix dlname in libz.la
diff --git a/zlib-1.2.5-use-correct-def-file.patch b/zlib-1.2.5-use-correct-def-file.patch
new file mode 100644
index 0000000..42cb76e
--- /dev/null
+++ b/zlib-1.2.5-use-correct-def-file.patch
@@ -0,0 +1,8 @@
+--- zlib-1.2.5/win32/zlib.def.orig 2012-02-26 16:19:28.608868501 +0100
++++ zlib-1.2.5/win32/zlib.def 2012-02-26 16:19:34.156864592 +0100
+@@ -1,4 +1,4 @@
+-LIBRARY
++LIBRARY zlib1.dll
+ ; zlib data compression library
+
+ EXPORTS
12 years, 2 months
[mingw32-zlib/f17: 3/3] Merge branch 'master' into f17
by Erik van Pienbroek
commit a5cd572201812d1f760c894300c5916f0ca56394
Merge: 31b7614 15be48b
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Feb 27 20:40:11 2012 +0100
Merge branch 'master' into f17
mingw32-zlib.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
12 years, 2 months