[mingw-tk: 9/10] Modernize the spec file

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 18:04:23 UTC 2012


commit 77984b68ddb21e55afffa3f0983171f4b284a1b5
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 20:00:55 2012 +0200

    Modernize the spec file

 mingw-tk.spec |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/mingw-tk.spec b/mingw-tk.spec
index 9aff39c..72f5867 100644
--- a/mingw-tk.spec
+++ b/mingw-tk.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}
 
 %global majorver1 8
 %global majorver2 5
@@ -24,7 +21,6 @@ Patch2:    tk8.5-conf.patch
 # this patch isn't needed since tk8.6b1
 Patch3:    tk-seg_input.patch
 Patch4:    tk-8.5.6-mingw32.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: autoconf
 BuildRequires: file
 BuildRequires: m4
@@ -78,7 +74,6 @@ make TCL_LIBRARY=%{_mingw32_datadir}/%{name1}%{majorver}
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install -C win INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_mingw32_datadir}/%{name1}%{majorver}
 
 pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
@@ -118,11 +113,7 @@ sed -i -e "s|$PWD/win|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_
 rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/%{name1}%{majorver}/tclAppInit.c
 rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/%{name1}%{majorver}/ldAix
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n mingw32-%{name1}
-%defattr(-,root,root,-)
 %{_mingw32_bindir}/wish*
 %{_mingw32_bindir}/%{name1}%{majorver1}%{majorver2}.dll
 %{_mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.dll.a
@@ -138,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 8.5.9-5
 - Renamed the source package to mingw-tk (#801037)
+- Modernize the spec file
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.9-4
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list