X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fnlib.spec;h=24985b80345530ff2ebd75e2574f0fa1286ea8c0;hb=34b9764539a6461e1826c4ff78fca390b47d5cd7;hp=996da82c27c4a423793ff8e025ecd27f7276b33a;hpb=9751e3de3501c13081ab9b4d2fd559e0ac15e464;p=packages%2Ffnlib.git

diff --git a/fnlib.spec b/fnlib.spec
index 996da82..24985b8 100644
--- a/fnlib.spec
+++ b/fnlib.spec
@@ -1,23 +1,26 @@
-Summary:	Color Font rendering lobrary for X11R6
+Summary:	Color Font rendering library for X11R6
 Summary(pl):	Biblioteki do renderowania fontów pod X11R6
 Name:		fnlib
 Version:	0.4
-Release:	9
-Copyright:	LGPL
+Release:	11
+License:	LGPL
 Group:		X11/Libraries
 Group(pl):	X11/Biblioteki
-Source:		ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.gz
-BuildPrereq:	XFree86-devel
-BuildPrereq:	imlib-devel
-BuildRoot:	/tmp/%{name}-%{version}-root
+Source0:	ftp://ftp.gnome.org/pub/GNOME/stable/sources/fnlib/%{name}-%{version}.tar.gz
+BuildRequires:	XFree86-devel
+BuildRequires:	imlib-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_prefix		/usr/X11R6
+%define		_sysconfdir	/etc/X11
 
 %description
-Fnlib is a library that provides full scalable 24-bit Color font rendering
-abilities for X.
+Fnlib is a library that provides full scalable 24-bit Color font
+rendering abilities for X.
 
 %description -l pl
-Fnlib jest bibliotek±, która umo¿liwia renderowanie fontów skalowalnych pod
-X11.
+Fnlib jest bibliotek±, która umo¿liwia renderowanie fontów
+skalowalnych pod X11.
 
 %package devel
 Summary:	Fnlib headers and documentation
@@ -40,29 +43,24 @@ Group(pl):	X11/Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
 %description static
-Fnlib static libraries 
+Fnlib static libraries.
 
 %description -l pl static
-Biblioteki statyczne fnlib
+Biblioteki statyczne fnlib.
 
 %prep
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target} \
-	--prefix=/usr/X11R6 \
-	--sysconfdir=/etc/X11
+%configure
 
-make fontsdir=/usr/X11R6/share/fnlib_fonts
+%{__make} fontsdir=%{_datadir}/fnlib_fonts
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-strip --strip-unneeded $RPM_BUILD_ROOT/usr/X11R6/lib/lib*.so.*.*
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
 
-gzip -9nf {README,doc/fontinfo.README}
+gzip -9nf README doc/fontinfo.README
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -74,49 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.gz
 
-%attr(755,root,root) /usr/X11R6/lib/lib*.so.*.*
-%config /etc/X11/*
-/usr/X11R6/share/fnlib_fonts
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%config %{_sysconfdir}/*
+%{_datadir}/fnlib_fonts
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/index.html doc/fontinfo.README.gz
 
-%attr(755,root,root) /usr/X11R6/lib/lib*.so
-/usr/X11R6/include/*
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_includedir}/*
 
 %files static
-%defattr(644,root,root)
-/usr/X11R6/lib/lib*.a
-
-%changelog
-* Mon Apr 19 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.4-9]
-- recompiles on new rpm.
-
-* Sun Mar 21 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.4-2]
-- strip with --strip-unneeded shared libraries.
-
-* Tue Jan 05 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.4-1]
-- changed base Source Url to ftp://ftp.gnome.org/pub/GNOME/sources/,
-- sysconfdir changed to /etc/X11,
-- removed HACKING from %doc,
-- added useing DESTDIR in "make install",
-- added LDFLAGS="-s" to ./configure enviroment.
-
-* Mon Oct 26 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.3-4]
-- header files moved to /usr/X11R6/include,
-- fontsdir changed to /usr/X11R6/share/fnlib_fonts.
-
-* Sat Sep 26 1998 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
-  [0.3-3]
-- added pl translation.
-
-* Tue Jul 07 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-  [0.3-2]
-- start at Raster spec,
-- added %changelog,
-- build against GNU libc-2.1.
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a