Accepting request 75659 from home:namtrac:branches:M17N

freetype2:

- Clean spec file
- Disable static libraries
- Drop unneeded use_unix.diff
- Disable newly introduced bzip2 support, it seems to create
  problems with subpixel rendering

ft2demos:

- Cleanup spec file
- Drop unneeded use_unix.diff

OBS-URL: https://build.opensuse.org/request/show/75659
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=46

ft2demos.spec

@@ -15,27 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           ft2demos
-BuildRequires:  xorg-x11-devel
-License:        GPLv2+
-Group:          Productivity/Publishing/Other
-AutoReqProv:    on
-Supplements:    fonts-config
 Version:        2.4.5
 Release:        4
+License:        GPLv2+
+Summary:        Freetype2 Utilities and Demo Programs
 %define freetype_version %{version}
 Url:            http://www.freetype.org
-Summary:        Freetype2 Utilities and Demo Programs
+Group:          Productivity/Publishing/Other
 Source0:        http://savannah.nongnu.org/download/freetype/freetype-%{version}.tar.bz2
 Source1:        http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
 Patch9:         fix-build.patch
 Patch308961:    bugzilla-308961-cmex-workaround.patch
 Patch50:        ft2demos-build-testname.patch
 Patch200:       freetype2-subpixel.patch
-Patch201:       use_unix.diff
+BuildRequires:  xorg-x11-devel
+Supplements:    fonts-config
 
 Source1000:     bnc628213_test.otf
 Source1004:     bnc629447_sigsegv31.ttf
@@ -59,38 +56,29 @@ popd
 %if %{enable_subpixel_rendering}
 %patch200 -p 1 -b .subpixel
 %endif
-%patch201 -p1
-
-cp /usr/share/automake*/config.{guess,sub} builds/unix
 
 %build
-ln -s /usr/bin/libtool ./builds/unix/libtool
-make setup CFG="--prefix=%{_prefix} --libdir=%{_libdir} --with-zlib"
-make prefix=%{_prefix} libdir=%{_libdir} %{_smp_mflags}
-# build the documentation in the references subdirectory:
-# (this needs python and we cannot have python in the BuildRequires of
-# a basic package like freetype2, therefore we cannot do it here but we have
-# to generate this documentation manually)
-# make refdoc
+%configure --without-bzip2
+make %{_smp_mflags}
+
 pushd ..
     ln -s freetype-%{freetype_version} freetype2
     cd ft2demos-%{version}
-    make prefix=%{_prefix} libdir=%{_libdir}
+    make %{_smp_mflags}
 popd
 
 %install
-#make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p %{buildroot}%{_bindir}
 pushd ../ft2demos-%{version}/bin/.libs
-    install -m 755 ft* $RPM_BUILD_ROOT%{_bindir}
+    install -m 755 ft* %{buildroot}%{_bindir}
 popd
 
 %check
-$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1000}
-$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail"
-$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail"
-$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail"
-$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1016}
+%{buildroot}%{_bindir}/ftbench -c 1 %{S:1000}
+%{buildroot}%{_bindir}/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail"
+%{buildroot}%{_bindir}/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail"
+%{buildroot}%{_bindir}/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail"
+%{buildroot}%{_bindir}/ftbench -c 1 %{S:1016}
 
 %clean