[mingw-libxml2: 28/29] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 19:58:43 UTC 2012


commit 559bd78dbeac68a792e58bda20447a5234b54642
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:53:40 2012 +0200

    Modernize the spec file

 mingw-libxml2.spec |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index b5f1816..e492dc4 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -1,8 +1,5 @@
 %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:           mingw-libxml2
@@ -14,7 +11,6 @@ License:        MIT
 Group:          Development/Libraries
 URL:            http://xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
@@ -28,7 +24,7 @@ Patch1002:      libxml2-gnome-bug-561340-fix.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -59,7 +55,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows XML processing library.
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
@@ -89,8 +85,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
 
@@ -111,12 +105,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -n mingw32-libxml2
-%defattr(-,root,root,-)
 %{_mingw32_bindir}/libxml2-2.dll
 %{_mingw32_bindir}/xml2-config
 %{_mingw32_bindir}/xmlcatalog.exe
@@ -130,13 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files -n mingw32-libxml2-static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libxml2.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 2.7.8-5
 - Renamed the source package to mingw-libxml2 (#800440)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.8-4
 - Rebuild against the mingw-w64 toolchain


More information about the mingw mailing list