[mingw32-gtkhtml3] Rebuild against libpng 1.5 and various cleanups
epienbro
epienbro at fedoraproject.org
Tue Jan 31 20:55:47 UTC 2012
commit 3bb27d5e35f145e6c90eeb907c78dabaee9156b2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Jan 31 21:55:24 2012 +0100
Rebuild against libpng 1.5 and various cleanups
- Rebuild against libpng 1.5
- Dropped unneeded RPM tags
- Dropped the dependency extraction overrides as that's done automatically as of RPM 4.9
- Dropped all .la files
mingw32-gtkhtml3.spec | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/mingw32-gtkhtml3.spec b/mingw32-gtkhtml3.spec
index 87d69a1..def115b 100644
--- a/mingw32-gtkhtml3.spec
+++ b/mingw32-gtkhtml3.spec
@@ -1,20 +1,16 @@
%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-gtkhtml3
Version: 3.32.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MinGW library for embedding a lightweight web browser in GTK programs
License: LGPLv2+
Group: Development/Libraries
URL: http://projects.gnome.org/evolution/
Source: http://download.gnome.org/sources/gtkhtml/3.32/gtkhtml-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# GConf doesn't work well on Win32 and it's only used by GtkHTML
# to figure out font-related settings like antialiasing. Even if
@@ -48,7 +44,7 @@ Patch4: gtkhtml-perform-g-thread-init-in-test-program.patch
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 53
+BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gtk2
@@ -78,7 +74,7 @@ Group: Development/Libraries
Static version of the MinGW Windows GtkHTML library.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
@@ -110,8 +106,6 @@ popd
%install
-rm -rf $RPM_BUILD_ROOT
-
# First install all the files belonging to the shared build
make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
@@ -127,18 +121,16 @@ sed -i s/"old_library=''"/"old_library='libgtkhtml-editor-3.14.a'"/ $RPM_BUILD_R
# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
+
# Install a small test program
install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/testgtkhtml.exe
%find_lang gtkhtml-3.14
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f gtkhtml-3.14.lang
-%defattr(-,root,root,-)
%doc COPYING.LIB
%{_mingw32_bindir}/gtkhtml-editor-test.exe
%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
@@ -146,20 +138,23 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_bindir}/testgtkhtml.exe
%{_mingw32_includedir}/libgtkhtml-3.14
%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
-%{_mingw32_libdir}/libgtkhtml-3.14.la
%{_mingw32_libdir}/libgtkhtml-editor-3.14.dll.a
-%{_mingw32_libdir}/libgtkhtml-editor-3.14.la
%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
%{_mingw32_libdir}/pkgconfig/gtkhtml-editor-3.14.pc
%{_mingw32_datadir}/gtkhtml-3.14
%files static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libgtkhtml-3.14.a
%{_mingw32_libdir}/libgtkhtml-editor-3.14.a
%changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32-2-4
+- Rebuild against libpng 1.5
+- Dropped unneeded RPM tags
+- Dropped the dependency extraction overrides as that's done automatically as of RPM 4.9
+- Dropped all .la files
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.32.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list