rpms/Coin2/devel Coin2.spec,1.8,1.9

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
- Introduce %%{coin_includedir} %%{coin_htmldir}.
- Misc. spec cleanup.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Coin2.spec	6 May 2005 05:26:28 -0000	1.8
+++ Coin2.spec	10 May 2005 16:45:53 -0000	1.9
@@ -1,17 +1,17 @@
+%define coin_includedir %{_includedir}/Coin2
+%define coin_htmldir %{_datadir}/Coin2
+
 %define srcvers	2.3.0
 %define apivers 2
 
-%define name %{?_name:%{_name}}%{!?_name:Coin2}
-
 %define libopenal_SONAME libopenal.so.0
 %define libsimage_SONAME libsimage.so.20
 %define libfreetype_SONAME libfreetype.so.6
 
 Summary: High-level 3D visualization library
-Name: %{name}
+Name: Coin2
 Version: %{srcvers}
-Release: 8.fc4
-
+Release: 9%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -43,7 +43,7 @@
 %package devel
 Summary: Development files for Coin
 Requires: %{name} = %{version}-%{release}
-Requires: XFree86-devel zlib-devel bzip2-devel
+Requires: xorg-x11-devel zlib-devel bzip2-devel
 Group: Development/Libraries
 
 %description devel
@@ -51,12 +51,12 @@
 
 %prep
 %setup -q -n Coin-%{version}
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p1 -b .orig
-%patch5 -p1 -b .orig
+%patch4 -p1
+%patch5 -p1
 
 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
   src/glue/freetype.c
@@ -67,7 +67,7 @@
 
 %build
 %configure \
-	--includedir=%{_includedir}/Coin%{apivers} \
+	--includedir=%{coin_includedir} \
 	--disable-dependency-tracking \
         --enable-static \
 	--disable-dl-libbzip2 \
@@ -75,7 +75,8 @@
 	--disable-dl-zlib \
 	--enable-man \
 	--enable-html \
-	--enable-3ds-import
+	--enable-3ds-import \
+	htmldir=%{coin_htmldir}/Coin
 make %{?_smp_mflags}
 
 %install
@@ -99,7 +100,7 @@
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_includedir}/Coin%{apivers}
+%{coin_includedir}
 %{_libdir}/libCoin.*a
 %{_libdir}/libCoin.so
 %{_datadir}/aclocal/coin.m4
@@ -107,9 +108,13 @@
 %{_datadir}/Coin/conf
 %{_datadir}/Coin/draggerDefaults
 %{_mandir}/man?/*
-%doc %{_datadir}/Coin/html
+%doc %{coin_htmldir}
 
 %changelog
+* Tue May 10 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-9
+- Introduce %%{coin_includedir} %%{coin_htmldir}.
+- Misc. spec cleanup.
+
 * Fri May 06 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-8
 - Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead
   SONAME handling.
@@ -117,9 +122,6 @@
 * Tue May 03 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-7
 - Minor spec changes.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.3.0-6
-- rebuilt
-
 * Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
 - Include simacros.
 - Regenerate configure from simacros and FC3 libtool for x86_64.