rpms/aalib/devel aalib.spec,1.10,1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20779

Modified Files:
	aalib.spec 
Log Message:
* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-0.rc5.7
- Fix modular X dependencies.
- Rebuild against new slang.
- Disable static lib, not shipping it anyway.
- Prune unneeded libs from aalib-config (and corresponding deps from -devel).
- Don't use %exclude.



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aalib.spec	21 Nov 2005 20:47:42 -0000	1.10
+++ aalib.spec	28 Nov 2005 10:12:05 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: 	An ASCII art library.
 Name: 		aalib
 Version: 	1.4.0
-Release: 	0.%{rc_subver}.6
+Release: 	0.%{rc_subver}.7
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -13,13 +13,12 @@
 Patch1:		%{name}-config-rpath.patch
 Patch2:		aalib-1.4rc5-bug149361.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	slang-devel libX11-devel gpm-devel
+BuildRequires:	slang-devel libXt-devel gpm-devel
 
 %package devel
 Summary:	aalib development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libX11-devel, slang-devel, gpm-devel
 Requires(post):	/sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -41,17 +40,18 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1 -b .bug149361
+sed -i -e 's/^\(.*SHARED.*\)@AALIB_LIBS@/\1 -laa/' aalib-config.in
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir || :
+rm -f $RPM_BUILD_ROOT{%{_libdir}/libaa.la,%{_infodir}/dir}
 
 
 %clean
@@ -72,7 +72,6 @@
 
 
 %files
-%exclude %{_libdir}/libaa.la
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS
 %{_bindir}/aafire
@@ -86,13 +85,19 @@
 %defattr(-,root,root,-)
 %{_bindir}/aalib-config
 %{_mandir}/man3/*
-%exclude %{_libdir}/libaa.a
 %{_libdir}/libaa.so
 %{_includedir}/aalib.h
 %{_infodir}/aalib.info*
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-0.rc5.7
+- Fix modular X dependencies.
+- Rebuild against new slang.
+- Disable static lib, not shipping it anyway.
+- Prune unneeded libs from aalib-config (and corresponding deps from -devel).
+- Don't use %%exclude.
+
 * Mon Nov 21 2005 Warren Togami <wtogami at redhat.com> - 1.4.0-0.rc5.6
 - remove .a
 - XFree86-devel -> libX11-devel