rpms/libapreq2/FC-4 libapreq2.spec,1.2,1.3

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/libapreq2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21088/FC-4

Modified Files:
	libapreq2.spec 
Log Message:
* Fri Aug  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.06-2
- Include *.tag files in -devel docs, thanks to Bojan Smojver.
- Remove *.la instead of using %exclude.



Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/libapreq2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libapreq2.spec	21 Jul 2005 06:46:02 -0000	1.2
+++ libapreq2.spec	5 Aug 2005 12:36:13 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -54,6 +54,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}-dev
+aprver=$(apr-config --version)
+apuver=$(apu-config --version)
+%{__perl} -pi -e \
+  "s|<path>.*?</path>|<path>%{_docdir}/%{name}-devel-%{version}/</path>|" \
+  docs/apreq2.tag
+%{__perl} -pi -e \
+  "s|<path>.*?</path>|<path>%{_docdir}/apr-devel-$aprver/html/</path>|" \
+  docs/apr.tag
+%{__perl} -pi -e \
+  "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
+  docs/apu.tag
 %patch0
 ./buildconf
 
@@ -76,6 +87,7 @@
 cp -pR docs/html __docs ; rm __docs/installdox
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -103,16 +115,14 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apreq.conf
 %{_libdir}/libapreq2.so.*
 %{_libdir}/httpd/modules/mod_apreq2.so
-%exclude %{_libdir}/httpd/modules/mod_apreq2.la
 
 %files devel
 %defattr(-,root,root,-)
-%doc STATUS __docs/*
+%doc STATUS __docs/* docs/*.tag
 %{_bindir}/apreq2-config
 %{_includedir}/apreq2/
 %{_includedir}/httpd/apreq2/
 %{_libdir}/libapreq2.so
-%exclude %{_libdir}/libapreq2.la
 
 %files -n perl-%{name}
 %defattr(-,root,root,-)
@@ -124,6 +134,10 @@
 
 
 %changelog
+* Fri Aug  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.06-2
+- Include *.tag files in -devel docs, thanks to Bojan Smojver.
+- Remove *.la instead of using %%exclude.
+
 * Thu Jul 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.06-1
 - 2.06.