[mingw-glib2: 56/68] Clean up spec from cruft not needed with modern rpmbuild

epienbro epienbro at fedoraproject.org
Tue Mar 6 19:56:34 UTC 2012


commit b60b6dbe943ec6455af2560c1786936fd2da722f
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Aug 30 21:11:27 2011 +0300

    Clean up spec from cruft not needed with modern rpmbuild

 mingw32-glib2.spec |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec
index c958901..7b1e39b 100644
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.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:           mingw32-glib2
@@ -16,11 +13,10 @@ URL:            http://www.gtk.org
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 Source0:        http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem >= 68
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -83,8 +79,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
 
@@ -146,12 +140,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0
 %find_lang glib20
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f glib20.lang
-%defattr(-,root,root,-)
 %{_mingw32_bindir}/gdbus.exe
 %{_mingw32_bindir}/glib-compile-schemas.exe
 %{_mingw32_bindir}/glib-genmarshal.exe
@@ -196,7 +185,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/glib-2.0/
 
 %files static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libgio-2.0.a
 %{_mingw32_libdir}/libglib-2.0.a
 %{_mingw32_libdir}/libgmodule-2.0.a


More information about the scm-commits mailing list