OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=14

fontconfig.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 26 12:14:12 CEST 2008 - crrodriguez@suse.de
+
+- kill "la" files and static libraries 
+
 -------------------------------------------------------------------
 Mon May 26 14:44:48 CEST 2008 - mfabian@suse.de
 

fontconfig.spec

@@ -2,9 +2,16 @@
 # spec file for package fontconfig (Version 2.4.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -24,7 +31,7 @@ Url:            http://fontconfig.org/
 AutoReqProv:    on
 Requires:       bash
 Version:        2.4.2
-Release:        88
+Release:        109
 Summary:        Library for Font Configuration
 # CVS can be found here: (CVS is gone, fontconfig uses git now).
 # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
@@ -82,8 +89,8 @@ Authors:
 
 %package devel
 License:        X11/MIT
-Requires:       fontconfig = %version
-Requires:       freetype2-devel glibc-devel libexpat-devel
+Requires:       %{name} = %version
+Requires:       freetype2-devel glibc-devel
 Provides:       XFree86-devel:%_libdir/pkgconfig/fontconfig.pc
 Group:          Development/Libraries/C and C++
 Summary:        Include Files and Libraries mandatory for Development.
@@ -131,28 +138,24 @@ Authors:
 %patch32 -p1
 
 %build
-%define myprefix /usr
-export CFLAGS="$RPM_OPT_FLAGS"
-#./autogen.sh \
-./configure \
-  --prefix=%{myprefix} \
-  --libdir=%{myprefix}/%{_lib} \
-  --with-freetype-lib=%_libdir \
-  --with-x \
-  --with-pic \
-  --enable-libxml2=no \
-  --mandir=%{_mandir} \
-  --localstatedir=/var \
-  --with-confdir=/etc/fonts \
-  --with-docdir=%{_defaultdocdir}/%{name} \
-  --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
-%if %{build_docs} < 1
-  --disable-docs
-%else
+%configure --disable-static --with-pic  \
+	--with-freetype-lib=%_libdir \
+  	--with-x \
+  	--enable-libxml2=no \
+  	--with-confdir=/etc/fonts \
+  	--with-docdir=%{_defaultdocdir}/%{name} \
+  	--with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
+	%if %{build_docs} < 1
+  	--disable-docs
+	%else
   #
 %endif
 make %{?jobs:-j %jobs}
-make check
+
+%check
+export MALLOC_CHECK_=2
+make %{?jobs:-j %jobs} check
+unset MALLOC_CHECK_
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install
@@ -192,6 +195,7 @@ pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
 popd
 # don't package any files in the cache directory, only the directory itself:
 rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/*
+rm -f %{buildroot}%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
 
@@ -203,10 +207,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc %{_defaultdocdir}/%{name}
-%{myprefix}/bin/fc-list
-%{myprefix}/bin/fc-cache
-%{myprefix}/bin/fc-match
-%{myprefix}/bin/fc-cat
+%{_bindir}/fc-list
+%{_bindir}/fc-cache
+%{_bindir}/fc-match
+%{_bindir}/fc-cat
 %dir /etc/fonts
 %config /etc/fonts/fonts.dtd
 %config /etc/fonts/fonts.conf
@@ -222,7 +226,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/fonts/conf.d/README
 %config(noreplace) /etc/fonts/conf.d/*.conf
 %config /etc/fonts/local.conf.instsys
-%{myprefix}/%{_lib}/libfontconfig.so.*
+%{_libdir}/libfontconfig.so.*
 %doc %{_mandir}/man5/fonts-conf.5.gz
 %doc %{_mandir}/man1/*
 %dir /var/cache/fontconfig/
@@ -231,12 +235,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc %{_defaultdocdir}/%{name}-devel
 %{_libdir}/pkgconfig/fontconfig.pc
-%{myprefix}/%{_lib}/libfontconfig.*a
-%{myprefix}/%{_lib}/libfontconfig.so
+%{_libdir}/libfontconfig.so
 %doc %{_mandir}/man3/Fc*
-%{myprefix}/include/fontconfig/
+%{_includedir}/fontconfig/
 
 %changelog
+* Tue Aug 26 2008 crrodriguez@suse.de
+- kill "la" files and static libraries
 * Mon May 26 2008 mfabian@suse.de
 - bnc#246804: remove workaround to force the detection of FreeMono
   as monospace, freefont >= 0.20080323 has the spacing problem