Accepting request 306595 from home:fstrba:freetype2

Condition it properly for factory

OBS-URL: https://build.opensuse.org/request/show/306595
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXft?expand=0&rev=16

libXft.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 11 17:01:09 UTC 2015 - fstrba@suse.com
+
+- Build against the freetype2-bootstrap-devel package and
+  BuildIgnore the libfreetype6 and freetype2-devel for suse_version
+  bigger then 13.2
+  * Should help to prevent cycles in build service.
+
 -------------------------------------------------------------------
 Fri Jun  6 10:52:07 UTC 2014 - sndirsch@suse.com
 

libXft.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libXft
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,41 +16,44 @@
 #
 
 
-Name:           libXft
 %define lname	libXft2
+Name:           libXft
 Version:        2.3.2
 Release:        0
 Summary:        X FreeType library
 License:        MIT
 Group:          Development/Libraries/C and C++
 Url:            http://xorg.freedesktop.org/
-
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/libXft
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libXft/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
-# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig) >= 2.5.92
-BuildRequires:  pkgconfig(freetype2) >= 2.1.6
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xrender) >= 0.8.2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1320
+BuildRequires:  freetype2-bootstrap-devel
+#!BuildIgnore:  libfreetype6
+#!BuildIgnore:  freetype2-devel
+%else
+BuildRequires:  pkgconfig(freetype2) >= 2.1.6
+%endif
 
 %description
 Xft is a library that connects X applications with the FreeType font
 rasterization library. Xft uses fontconfig to locate fonts so it has
 no configuration files.
 
-%package -n %lname
+%package -n %{lname}
 Summary:        X FreeType library
 Group:          System/Libraries
 
-%description -n %lname
+%description -n %{lname}
 Xft is a library that connects X applications with the FreeType font
 rasterization library. Xft uses fontconfig to locate fonts so it has
 no configuration files.
@@ -58,7 +61,7 @@ no configuration files.
 %package devel
 Summary:        Development files for the X FreeType library
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %version
+Requires:       %{lname} = %{version}
 
 %description devel
 Xft is a library that connects X applications with the FreeType font
@@ -66,7 +69,7 @@ rasterization library. Xft uses fontconfig to locate fonts so it has
 no configuration files.
 
 This package contains the development headers for the library found
-in %lname.
+in %{lname}.
 
 %prep
 %setup -q
@@ -77,22 +80,22 @@ autoreconf -fi
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot"
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
-rm -f "%buildroot/%_libdir"/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
 
-%postun -n %lname -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 
-%files -n %lname
+%files -n %{lname}
 %defattr(-,root,root)
-%_libdir/libXft.so.2*
+%{_libdir}/libXft.so.2*
 
 %files devel
 %defattr(-,root,root)
-%_includedir/X11/Xft
+%{_includedir}/X11/Xft
-%_libdir/libXft.so
+%{_libdir}/libXft.so
-%_libdir/pkgconfig/xft.pc
+%{_libdir}/pkgconfig/xft.pc
-%_mandir/man3/*
+%{_mandir}/man3/*
 
 %changelog