rpms/Coin2/FC-3 Coin2.spec,1.6,1.7
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Tue May 10 16:45:56 UTC 2005
Author: corsepiu
Update of /cvs/extras/rpms/Coin2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372/FC-3
Modified Files:
Coin2.spec
Log Message:
- Introduce %%{coin_includedir} %%{coin_htmldir}.
- Misc. spec cleanup.
Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Coin2.spec 6 May 2005 05:26:29 -0000 1.6
+++ Coin2.spec 10 May 2005 16:45:53 -0000 1.7
@@ -1,16 +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.fc3
+Release: 9%{?dist}
License: GPL
Group: System Environment/Libraries
@@ -42,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
@@ -50,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
@@ -66,7 +67,7 @@
%build
%configure \
- --includedir=%{_includedir}/Coin%{apivers} \
+ --includedir=%{coin_includedir} \
--disable-dependency-tracking \
--enable-static \
--disable-dl-libbzip2 \
@@ -74,7 +75,8 @@
--disable-dl-zlib \
--enable-man \
--enable-html \
- --enable-3ds-import
+ --enable-3ds-import \
+ htmldir=%{coin_htmldir}/Coin
make %{?_smp_mflags}
%install
@@ -98,7 +100,7 @@
%files devel
%defattr(-,root,root,-)
%{_bindir}/*
-%{_includedir}/Coin%{apivers}
+%{coin_includedir}
%{_libdir}/libCoin.*a
%{_libdir}/libCoin.so
%{_datadir}/aclocal/coin.m4
@@ -106,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.
More information about the fedora-extras-commits
mailing list