[mingw32-cairo] Dropped the proxy-libintl pieces
by Erik van Pienbroek
commit 06bd1e1713a3565beeb6156750bbc82c793a9f09
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Wed Apr 27 22:40:51 2011 +0200
Dropped the proxy-libintl pieces
mingw32-cairo.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index 33074ca..6513493 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -7,7 +7,7 @@
Name: mingw32-cairo
Version: 1.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.10.2-2
+- Dropped the proxy-libintl pieces
+
* Mon Apr 25 2011 Kalev Lember <kalev(a)smartlink.ee> - 1.10.2-1
- Update to 1.10.2
12 years, 11 months
[mingw32-glib2/f15/master: 2/2] Merge branch 'master' into f15
by Erik van Pienbroek
commit d2752af778cbef778cfe7f793f557f3373bafbe3
Merge: dcbc646 04e4ad7
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Wed Apr 27 19:15:25 2011 +0200
Merge branch 'master' into f15
mingw32-glib2.spec | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
12 years, 11 months
[mingw32-glib2] Dropped the proxy-libintl pieces
by Erik van Pienbroek
commit 04e4ad78a551fef6fa24f08b6f93a7b71628b502
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Wed Apr 27 19:14:51 2011 +0200
Dropped the proxy-libintl pieces
mingw32-glib2.spec | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec
index ede6b5c..33257dc 100644
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.spec
@@ -7,7 +7,7 @@
Name: mingw32-glib2
Version: 2.28.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@@ -62,10 +62,6 @@ Static version of the MinGW Windows GLib2 library.
%build
-# Make sure that libtool doesn't complain that it can't find
-# the 'real file for library -lintl'
-export lt_cv_deplibs_check_method="pass_all"
-
# GLib can't build static and shared libraries in one go, so we
# build GLib twice here
mkdir build_static
@@ -139,16 +135,6 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
# Bash-completion files aren't interesting for mingw32
rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d
-# The libtool files refer to libintl while they shouldn't
-# Drop this reference manually
-find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \;
-
-# Let binaries depending on GLib link against libproxy-intl in a way that libtool doesn't refuse
-sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la
-
-# Make the pkgconfig LDFLAGS libtool-friendly (as libintl it's a soft dependency now)
-sed -i s/"-lintl"/"-Wl,-lintl"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
-
%find_lang glib20
@@ -214,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.28.6-2
+- Dropped the proxy-libintl pieces
+
* Sat Apr 23 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.28.6-1
- Update to 2.28.6
- Dropped the ugly build hack as it isn't needed anymore (the
12 years, 11 months
[mingw32-gettext] Dropped the proxy-libintl pieces
by Erik van Pienbroek
commit a8889f35706cec8466794dee2212b10333c82cdf
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Wed Apr 27 17:36:37 2011 +0200
Dropped the proxy-libintl pieces
Dropped the proxy-libintl pieces as the upstream gtk+ win32 maintainers also decided to drop it and it's causing more harm than good
libintl.c | 367 --------------------------------------------------
libintl.h | 70 ----------
mingw32-gettext.spec | 30 +---
3 files changed, 8 insertions(+), 459 deletions(-)
---
diff --git a/mingw32-gettext.spec b/mingw32-gettext.spec
index 869458a..e9eadcb 100644
--- a/mingw32-gettext.spec
+++ b/mingw32-gettext.spec
@@ -6,7 +6,7 @@
Name: mingw32-gettext
Version: 0.17
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
@@ -15,11 +15,6 @@ URL: http://www.gnu.org/software/gettext/
Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Proxy-libintl
-# See http://www.gtk.org/download-windows.html for more details
-Source1: libintl.c
-Source2: libintl.h
-
Patch0: mingw32-gettext-0.17-gnulib-optarg-symbols.patch
BuildArch: noarch
@@ -60,12 +55,6 @@ Static version of the MinGW Windows Gettext library.
%build
-# Build proxy-libintl manually
-cp %{SOURCE1} .
-cp %{SOURCE2} .
-%{_mingw32_cc} -c libintl.c -o libintl.o -I.
-%{_mingw32_ar} rc libintl.a libintl.o
-
%{_mingw32_configure} \
--disable-java \
--disable-native-java \
@@ -88,13 +77,6 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/
-# Install the proxy-libintl pieces
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.la
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.dll.a
-install -m 0644 libintl.a $RPM_BUILD_ROOT%{_mingw32_libdir}/
-rm -f $RPM_BUILD_ROOT%{_mingw32_includedir}/libintl.h
-install -m 0644 libintl.h $RPM_BUILD_ROOT%{_mingw32_includedir}/
-
%find_lang %{name} --all-name
@@ -138,9 +120,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libgettextsrc.dll.a
%{_mingw32_libdir}/libgettextsrc.la
-# This isn't really a static library, but a small wrapper library
-# which adds the ability to have a soft dependency on libintl-8.dll
-%{_mingw32_libdir}/libintl.a
+%{_mingw32_libdir}/libintl.dll.a
+%{_mingw32_libdir}/libintl.la
%{_mingw32_docdir}/gettext
%{_mingw32_docdir}/libasprintf/autosprintf_all.html
@@ -155,9 +136,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_mingw32_libdir}/libasprintf.a
%{_mingw32_libdir}/libgettextpo.a
+%{_mingw32_libdir}/libintl.a
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.17.15
+- Dropped the proxy-libintl pieces as the upstream gtk+ win32 maintainers
+ also decided to drop it and it's causing more harm than good
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.17-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 11 months
[mingw32-zlib] Install zlib pkgconfig file
by Kalev Lember
commit 3aba1adffd1ffc5a7e72e2a15fbcb671b097640c
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Tue Apr 26 23:31:52 2011 +0300
Install zlib pkgconfig file
mingw32-zlib.spec | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-zlib.spec b/mingw32-zlib.spec
index 2d6d128..dcf8391 100644
--- a/mingw32-zlib.spec
+++ b/mingw32-zlib.spec
@@ -7,7 +7,7 @@
Name: mingw32-zlib
Version: 1.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
@@ -94,6 +94,15 @@ cp x/libzdll.a .libs/libz.dll.a
cp x/zlib1.dll .libs/
make %{?_smp_mflags}
+sed \
+ -e 's|@prefix@|%{_mingw32_prefix}|g' \
+ -e 's|@exec_prefix@|${prefix}|g' \
+ -e 's|@libdir@|%{_mingw32_libdir}|g' \
+ -e 's|@sharedlibdir@|${libdir}|g' \
+ -e 's|@includedir@|%{_mingw32_includedir}|g' \
+ -e 's|@VERSION@|%{version}|g' \
+ zlib.pc.in > zlib.pc
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -104,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}
rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll
install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/
+install -m 644 zlib.pc $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -116,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libz.dll.a
%{_mingw32_bindir}/zlib1.dll
%{_mingw32_libdir}/libz.la
+%{_mingw32_libdir}/pkgconfig/zlib.pc
%files static
@@ -134,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Apr 26 2011 Kalev Lember <kalev(a)smartlink.ee> - 1.2.5-3
+- Install zlib pkgconfig file
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 11 months
leaving the project
by Michael [Plouj] Ploujnikov
Hello fedora-mingw people,
I haven't really been active with the mingw project lately. In fact,
I've stopped using Fedora as my main distribution. As a result I've
decided that I should probably step down rather than being a dormant
"contributor".
It would be nice if someone takes ownership of my packages
(http://koji.fedoraproject.org/koji/userinfo?userID=986)"
mingw32-libtiff and mingw32-physfs. Also, there is current a security
bug assigned to me that needs to be taken care of:
https://bugzilla.redhat.com/show_bug.cgi?id=689575.
I'm sorry to have to bring you this sad news. I wish you and the
Fedora project as a whole all the best.
- Michael Ploujnikov
12 years, 11 months