[mingw-qt: 45/65] Spec clean up
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:30:32 UTC 2012
commit 8b4284b6b6d32da13b1f97723e4d1033ddecbcb1
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sun Aug 28 20:14:25 2011 +0300
Spec clean up
Recent rpmbuild versions don't need all the boilerplate code.
mingw32-qt.spec | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index ea3f78e..39157da 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.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}
#global pre rc1
@@ -29,11 +26,9 @@ Patch11: mingw32-qt-4.6.0-no-fpu-functions.patch
# The debug build tries to link against libdbus-1d which doesn't exist
Patch15: qt-dbus-dont-link-to-dbus-1d.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 52
+BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
@@ -147,8 +142,6 @@ popd
%install
-rm -rf $RPM_BUILD_ROOT
-
make install -C ../build_debug INSTALL_ROOT=$RPM_BUILD_ROOT
make install -C ../build_release INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -177,12 +170,7 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/uic
rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README
%{_mingw32_bindir}/Qt3Support4.dll
%{_mingw32_bindir}/Qt3Supportd4.dll
More information about the scm-commits
mailing list