rpms/voms/F-13 import.log,1.7,1.8 voms.spec,1.7,1.8

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31353/F-13

Modified Files:
	import.log voms.spec 
Log Message:
* Thu Jul 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.17.1-2
- Make -doc subpackage depend of main package for license reasons



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-13/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Jun 2010 06:31:12 -0000	1.7
+++ import.log	8 Jul 2010 08:52:27 -0000	1.8
@@ -5,3 +5,4 @@ voms-1_9_14_3-1_fc12:HEAD:voms-1.9.14.3-
 voms-1_9_16_1-1_fc12:F-13:voms-1.9.16.1-1.fc12.src.rpm:1269095431
 voms-1_9_16_1-2_fc12:F-13:voms-1.9.16.1-2.fc12.src.rpm:1270055522
 voms-1_9_17_1-1_fc12:F-13:voms-1.9.17.1-1.fc12.src.rpm:1275805844
+voms-1_9_17_1-2_fc12:F-13:voms-1.9.17.1-2.fc12.src.rpm:1278579102


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-13/voms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- voms.spec	6 Jun 2010 06:31:12 -0000	1.7
+++ voms.spec	8 Jul 2010 08:52:27 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		voms
 Version:	1.9.17.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -126,6 +126,7 @@ Group:		Documentation
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:	noarch
 %endif
+Requires:	%{name} = %{version}-%{release}
 
 %description doc
 Documentation for the Virtual Organization Membership Service.
@@ -329,13 +330,22 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
-mkdir -p VOMS_C_API
-cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
-install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API
-
-mkdir -p VOMS_CC_API
-cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
-install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p LICENSE AUTHORS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_C_API
+cp -pr doc/apidoc/api/VOMS_C_API/html \
+   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_C_API
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_C_API/html/installdox
+install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf \
+   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_C_API
+
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API
+cp -pr doc/apidoc/api/VOMS_CC_API/html \
+    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API/html/installdox
+install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf \
+    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API
 
 mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
    $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
@@ -398,7 +408,9 @@ fi
 %dir %{_sysconfdir}/grid-security/vomsdir
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/vomses.template
-%doc AUTHORS LICENSE
+%doc %dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -416,8 +428,8 @@ fi
 
 %files doc
 %defattr(-,root,root,-)
-%doc VOMS_C_API
-%doc VOMS_CC_API
+%doc %{_docdir}/%{name}-%{version}/VOMS_C_API
+%doc %{_docdir}/%{name}-%{version}/VOMS_CC_API
 
 %files clients
 %defattr(-,root,root,-)
@@ -465,6 +477,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Thu Jul 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.17.1-2
+- Make -doc subpackage depend of main package for license reasons
+
 * Sat Jun 05 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.17.1-1
 - Upstream 1.9.17.1 (CVS tag glite-security-voms_R_1_9_17_1)
 - Drop patches voms-db-method.patch and voms-thread.patch (accepted upstream)