Accepting request 104995 from home:saschpe:branches:M17N

- Ran spec-cleaner
- Add devel-static provides to devel package (shared library policy)

- Ran spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/104995
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=59
This commit is contained in:
Stephan Kulow 2012-02-15 06:21:00 +00:00 committed by Git OBS Bridge
parent 87ad0b41ef
commit 50c1345cf8
4 changed files with 18 additions and 13 deletions

View File

@ -5,6 +5,12 @@ Tue Feb 14 11:17:33 UTC 2012 - cfarrell@suse.com
Use SUSE- proprietary prefix until upstream spdx.org accepts Freetype as
official license
-------------------------------------------------------------------
Tue Feb 14 09:21:58 UTC 2012 - saschpe@suse.de
- Ran spec-cleaner
- Add devel-static provides to devel package (shared library policy)
-------------------------------------------------------------------
Thu Dec 22 12:39:23 CET 2011 - tiwai@suse.de

View File

@ -65,6 +65,8 @@ Obsoletes: freetype2-devel-64bit
%endif
# there is no freetype-devel on suse:
Provides: freetype-devel
# Static library provides:
Provides: libfreetype6-devel-static
%description devel
This package contains all necessary include files, libraries and
@ -90,10 +92,10 @@ export CFLAGS="$CFLAGS -std=gnu99"
%endif
%configure --without-bzip2 \
--disable-static
make %{_smp_mflags}
make %{?_smp_mflags}
%install
%makeinstall
%make_install
# these development documents should go into the freetype2-devel package:
mv docs/reference freetype-%{version}/docs
@ -101,9 +103,6 @@ mv docs/reference freetype-%{version}/docs
# remove documentation that does not belong in an rpm
rm docs/INSTALL*
%clean
rm -rf %{buildroot}
%post -n libfreetype6 -p /sbin/ldconfig
%postun -n libfreetype6 -p /sbin/ldconfig
@ -118,7 +117,7 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc freetype-%{version}/docs/*
%{_includedir}/*
%if %suse_version >= 1140
%if 0%{?suse_version} >= 1140
%exclude %{_libdir}/libfreetype.*a
%else
%{_libdir}/libfreetype.*a

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 14 09:21:51 UTC 2012 - saschpe@suse.de
- Ran spec-cleaner
-------------------------------------------------------------------
Tue Nov 15 08:24:39 UTC 2011 - idonmez@suse.com

View File

@ -32,13 +32,11 @@ Patch50: ft2demos-build-testname.patch
Patch200: freetype2-subpixel.patch
BuildRequires: xorg-x11-devel
Supplements: fonts-config
Source1000: bnc628213_test.otf
Source1004: bnc629447_sigsegv31.ttf
Source1013: bnc633938_badbdf.0
Source1015: bug-641580_CVE-2010-3311.cff
Source1016: bug-647375_tt2.ttf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -58,12 +56,11 @@ popd
%build
%configure --without-bzip2
make %{_smp_mflags}
make %{?_smp_mflags}
pushd ..
ln -s freetype-%{freetype_version} freetype2
cd ft2demos-%{version}
make %{_smp_mflags}
make %{?_smp_mflags}
popd
%install
@ -79,8 +76,6 @@ popd
%{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
%files
%defattr(-,root,root)
%{_bindir}/ft*