[mingw-fontconfig: 9/16] Spec cleanup

epienbro epienbro at fedoraproject.org
Tue Mar 6 18:46:01 UTC 2012


commit f36489a084e3233e6a42939ffb7d00cc0252f68c
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Mon May 23 09:32:36 2011 +0300

    Spec cleanup

 mingw32-fontconfig.spec |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/mingw32-fontconfig.spec b/mingw32-fontconfig.spec
index 8b318de..13b485b 100644
--- a/mingw32-fontconfig.spec
+++ b/mingw32-fontconfig.spec
@@ -1,8 +1,5 @@
 %define __strip %{_mingw32_strip}
 %define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-fontconfig
 Version:        2.8.0
@@ -13,11 +10,10 @@ License:        MIT
 URL:            http://fontconfig.org
 Source0:        http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 Group:          Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 40
+BuildRequires:  mingw32-filesystem >= 68
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -26,7 +22,6 @@ BuildRequires:  mingw32-freetype
 BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-libxml2
 BuildRequires:  pkgconfig
-BuildRequires:  docbook-utils
 
 Requires:       pkgconfig
 
@@ -41,13 +36,13 @@ MinGW Windows Fontconfig library.
 
 %build
 PATH="%{_mingw32_bindir}:$PATH" \
-%{_mingw32_configure} --with-arch=i686
+%{_mingw32_configure} \
+    --with-arch=i686 \
+    --disable-docs
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
@@ -60,12 +55,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/fontconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root)
 %doc COPYING
 %{_mingw32_bindir}/fc-cache.exe
 %{_mingw32_bindir}/fc-cat.exe
@@ -84,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon May 23 2011 Kalev Lember <kalev at smartlink.ee> - 2.8.0-1
 - Update to 2.8.0
+- Spec cleanup
 
 * Mon May 23 2011 Kalev Lember <kalev at smartlink.ee> - 2.6.0-12
 - Don't install html documentation which duplicates what is in Fedora native


More information about the scm-commits mailing list