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

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	neXtaw.spec 
Log Message:
* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1-7
- Adapt to modular X11 packaging.
- Don't ship static libraries by default.
- Build with dependency tracking disabled.
- Use "rm" instead of %exclude.
- Specfile cleanups.



Index: neXtaw.spec
===================================================================
RCS file: /cvs/extras/rpms/neXtaw/devel/neXtaw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- neXtaw.spec	25 Jun 2005 17:56:17 -0000	1.10
+++ neXtaw.spec	16 Nov 2005 21:00:21 -0000	1.11
@@ -1,21 +1,19 @@
-Summary:	Modified version of the Athena Widgets with a N*XTSTEP appearance
-Name:		neXtaw
-Version:	0.15.1
-Release:	6
-
-URL:		http://siag.nu/neXtaw/
-Source0:	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
-License:	MIT/X Consortium License
-Group:		System Environment/Libraries
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	xorg-x11-devel
-
-%package devel
-Summary:	Development files for the neXtaw library
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-x11-devel
+%bcond_with static
 
+Summary:        Modified version of the Athena Widgets with N*XTSTEP appearance
+Name:           neXtaw
+Version:        0.15.1
+Release:        7%{?dist}
+
+URL:            http://siag.nu/neXtaw/
+Source0:        http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
+License:        MIT/X Consortium License
+Group:          System Environment/Libraries
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+BuildRequires:  libXext-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXmu-devel
 
 %description
 neXtaw is a replacement library for the Athena (libXaw) widget set. It
@@ -23,6 +21,13 @@
 compatible with it. Its goal is to try to emulate the look and feel of
 the N*XTSTEP GUI.
 
+%package        devel
+Summary:        Development files for the neXtaw library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libXmu-devel
+Requires:       libXt-devel
+
 %description devel
 neXtaw is a replacement library for the Athena (libXaw) widget set. It
 is based on Xaw3d, by Kaleb Keithley and is almost 100% backward
@@ -36,13 +41,14 @@
 
 
 %build
-%configure
+%configure %{!?with_static:--disable-static} --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
@@ -50,22 +56,32 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO doc/CHANGES doc/FAQ doc/README.XAW3D
-%exclude %{_libdir}/libneXtaw.la
 %{_libdir}/libneXtaw.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/neXtaw/
 %{_libdir}/libneXtaw.so
+%if %{with static}
 %{_libdir}/libneXtaw.a
+%endif
 
 
 %changelog
+* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1-7
+- Adapt to modular X11 packaging.
+- Don't ship static libraries by default.
+- Build with dependency tracking disabled.
+- Use "rm" instead of %%exclude.
+- Specfile cleanups.
+
 * Sat Jun 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1-6
 - Rebuild.