[mingw-freetype: 11/18] Spec cleanup

epienbro epienbro at fedoraproject.org
Tue Mar 6 18:56:48 UTC 2012


commit 9228ce7cf68fba7a81efa364fa40794040f8a2ec
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Jul 30 14:51:02 2011 +0300

    Spec cleanup
    
    Also enable automatic mingw dep extraction and turn on -debuginfo
    subpackage creation.

 mingw32-freetype.spec |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-freetype.spec b/mingw32-freetype.spec
index ced80e7..e9e1a33 100644
--- a/mingw32-freetype.spec
+++ b/mingw32-freetype.spec
@@ -1,8 +1,6 @@
 %define __strip %{_mingw32_strip}
 %define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 # Patented subpixel rendering disabled by default.
 # Pass '--with subpixel_rendering' on rpmbuild command-line to enable.
@@ -21,7 +19,6 @@ Source0:        http://download.savannah.gnu.org/releases/freetype/freetype-%{ve
 Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
 #Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 Group:          Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Patches from native Fedora package.
 Patch21:        freetype-2.3.0-enable-spr.patch
@@ -33,19 +30,19 @@ Patch90:        freetype-2.4.5-CVE-2011-0226.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 68
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
 BuildRequires:  mingw32-dlfcn
 
-Requires:       pkgconfig
-
-
 %description
 MinGW Windows Freetype library.
 
 
+%{?_mingw32_debug_package}
+
+
 %prep
 %setup -q -n freetype-%{version} -b 1 -a 1
 
@@ -74,17 +71,10 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root)
 %doc docs/LICENSE.TXT
 %{_mingw32_bindir}/freetype-config
 %{_mingw32_bindir}/libfreetype-6.dll
@@ -100,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jul 30 2011 Kalev Lember <kalevlember at gmail.com> - 2.4.5-1
 - Update to 2.4.5
 - Synced patches with Fedora native freetype 2.4.5-2
+- Spec cleanup
+- Enable automatic mingw dep extraction
+- Create -debuginfo subpackage
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the mingw mailing list