rpms/voms/EL-6 import.log,1.7,1.8 voms.spec,1.7,1.8

Mattias Ellert ellert at fedoraproject.org
Mon Jul 19 17:23:20 UTC 2010 

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5461/EL-6

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/EL-6/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Jun 2010 06:37:29 -0000	1.7
+++ import.log	19 Jul 2010 17:23:20 -0000	1.8
@@ -5,3 +5,4 @@ voms-1_9_14_3-1_fc12:F-12:voms-1.9.14.3-
 voms-1_9_16_1-1_fc12:F-12:voms-1.9.16.1-1.fc12.src.rpm:1269095485
 voms-1_9_16_1-2_fc12:F-12:voms-1.9.16.1-2.fc12.src.rpm:1270055583
 voms-1_9_17_1-1_fc12:EL-6:voms-1.9.17.1-1.fc12.src.rpm:1275806222
+voms-1_9_17_1-2_el5:EL-6:voms-1.9.17.1-2.el5.src.rpm:1279560088


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-6/voms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- voms.spec	6 Jun 2010 06:37:29 -0000	1.7
+++ voms.spec	19 Jul 2010 17:23:20 -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
@@ -84,6 +84,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
+%ifarch %{ix86} x86_64
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
@@ -93,6 +94,7 @@ BuildRequires:	log4j
 %if %{with_gcj}
 BuildRequires:	java-gcj-compat-devel
 %endif
+%endif
 
 %description
 In grid computing, and whenever the access to resources may be controlled
@@ -126,6 +128,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.
@@ -167,6 +170,7 @@ The service can be understood as an acco
 information in a special format (VOMS credential). The VO manager can
 administrate it remotely using command line tools or a web interface.
 
+%ifarch %{ix86} x86_64
 %package -n vomsjapi
 Summary:	Virtual Organization Membership Service Java API
 Group:		Development/Libraries
@@ -205,6 +209,7 @@ Requires:	vomsjapi = %{version}-%{releas
 
 %description -n vomsjapi-javadoc
 Virtual Organization Membership Service (VOMS) Java API Documentation.
+%endif
 
 %prep
 %setup -q
@@ -254,16 +259,21 @@ install -m 644 %{SOURCE1} INSTALL.Fedora
 
 %build
 %configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
+%ifarch %{ix86} x86_64
 	   --with-java-home=/usr --with-bc=/usr/share/java/bcprov.jar \
 	   --with-log4j=/usr/share/java/log4j.jar \
 	   --with-commons-cli=/usr/share/java/commons-cli.jar \
 	   --with-commons-lang=/usr/share/java/commons-lang.jar
+%else
+	   --disable-java
+%endif
 
 make %{?_smp_mflags}
 
 ( cd doc/apidoc/api/VOMS_C_API/latex ; make )
 ( cd doc/apidoc/api/VOMS_CC_API/latex ; make )
 
+%ifarch %{ix86} x86_64
 mkdir javadoc
 cd javadoc
 CLASSPATH=../src/api/java:$(build-classpath \
@@ -272,6 +282,7 @@ javadoc ../src/api/java/org/glite/voms/*
 	../src/api/java/org/glite/voms/ac/*.java \
 	../src/api/java/org/glite/voms/contact/*.java
 cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -329,14 +340,24 @@ 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
 
+%ifarch %{ix86} x86_64
 mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
    $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
 ln -s vomsjapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar
@@ -348,6 +369,7 @@ ln -s vomsjapi-%{version} $RPM_BUILD_ROO
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -378,6 +400,7 @@ if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
 
+%ifarch %{ix86} x86_64
 %post -n vomsjapi
 %if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
@@ -387,6 +410,7 @@ fi
 %if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
 %endif
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -398,7 +422,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 +442,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,-)
@@ -450,6 +476,7 @@ fi
 %{_mandir}/man8/voms.8*
 %doc INSTALL.Fedora
 
+%ifarch %{ix86} x86_64
 %files -n vomsjapi
 %defattr(-,root,root,-)
 %{_javadir}/vomsjapi.jar
@@ -463,12 +490,19 @@ fi
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/vomsjapi
 %doc %{_javadocdir}/vomsjapi-%{version}
+%endif
 
 %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)
 
+* Sat Apr 03 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.16.1-2.1
+- Enable java for x86 and x86_64
+
 * Sun Mar 28 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.16.1-2
 - Add mutex lock for accessing private data

More information about the scm-commits mailing list