[Jpackage-commits] dist/opensaml/JPP-6 opensaml-component-info.xml, NONE, 1.1 opensaml.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Mon Feb 16 23:33:41 CET 2009


Update of /home/projects/jpackage/cvs/dist/opensaml/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv23948

Modified Files:
	opensaml.spec 
Added Files:
	opensaml-component-info.xml 
Log Message:
- add repolib
- use servlet_2_4_api for (Build)Requires
- fix xml-commons (Build)Requires
- don't own %%{_javadir}
- don't BuildRequires ant-nodeps
- correctly set OPT_JAR_LIST
- don't move java directory as it misses files
- fix mixed-use-of-spaces-and-tabs


--- NEW FILE: opensaml-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="opensaml"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="opensaml.jar"/>


    <export>
      <include input="opensaml.jar"/>

    </export>
  </component>
</project>

Index: opensaml.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/opensaml/JPP-6/opensaml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** opensaml.spec	16 Feb 2009 22:00:47 -0000	1.1
--- opensaml.spec	16 Feb 2009 22:33:39 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,77 ****
  #
  
! %define section         free
! 
! # To make the tarball:
! #  export CVSROOT=:pserver:anoncvs at anoncvs.internet2.edu:/home/cvs/shibboleth
! #  cvs login
! #  cvs export -r Rel_1_1_FINAL_B opensaml
  
! Name:		opensaml
! Summary:	Open source implementation of the SAML 1.0 and 1.1 specifications
! Version: 	1.1b
! Release:	1jpp
! Epoch:		0
  
! URL: 		http://www.opensaml.org/
! License: 	Apache Public License v2.0
! Group: 		Development/Libraries/Java
! Vendor:         JPackage Project
! Distribution:   JPackage
! Source0: 	%{name}-%{version}.tgz
  
! BuildRequires:	ant >= 1.6.2
! BuildRequires:	ant-junit >= 1.6.2
! BuildRequires:	ant-nodeps >= 1.6.2
! BuildRequires:	junit >= 3.8
! BuildRequires:	jakarta-commons-codec >= 1.3
! BuildRequires:	jakarta-commons-logging >= 1.0.4
! BuildRequires:	log4j >= 1.2.8
! BuildRequires:	tomcat5-servlet-2.4-api >= 5.5.9
! BuildRequires:	xalan-j2 >= 2.6.0
! BuildRequires:	xerces-j2 >= 2.6.2
! BuildRequires:	xml-commons-apis >= 0:1.3.02
! BuildRequires:	xml-commons-resolver >= 1.1
! BuildRequires:	xml-security >= 1.2.1
! Requires:  jakarta-commons-codec >= 1.3
! Requires:  jakarta-commons-logging >= 1.0.4
! Requires:  log4j >= 1.2.8
! Requires:  tomcat5-servlet-2.4-api >= 5.5.9
! Requires:  xalan-j2 >= 2.6.0
! Requires:  xerces-j2 >= 2.6.2
! Requires:  xml-commons-apis >= 0:1.3.02
! Requires:  xml-commons-resolver >= 1.1
! Requires:  xml-security >= 1.2.1
  
! BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
! BuildArch:		noarch
  
  %description
--- 29,78 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
  
! %define repodir %{_javadir}/repository.jboss.com/opensaml/%{version}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
! %define section free
  
! Name:           opensaml
! Version:        1.1b
! Release:        2%{?dist}
! Epoch:          0
! Summary:        Open source implementation of the SAML 1.0 and 1.1 specifications
! URL:            http://www.opensaml.org/
! License:        ASL 2.0
! Group:          Development/Libraries/Java
! Source0:        %{name}-%{version}.tgz
! Source1:        opensaml-component-info.xml
! Requires:       jakarta-commons-codec >= 0:1.3
! Requires:       jakarta-commons-logging >= 0:1.0.4
! Requires:       log4j >= 0:1.2.8
! Requires:       servlet_2_4_api
! Requires:       xalan-j2 >= 0:2.6.0
! Requires:       xerces-j2 >= 0:2.6.2
! Requires:       xml-commons-jaxp-1.3-apis >= 0:1.3.02
! Requires:       xml-commons-resolver11 >= 0:1.1
! Requires:       xml-security >= 0:1.2.1
! BuildRequires:  ant >= 0:1.6.2
! BuildRequires:  ant-junit >= 0:1.6.2
! BuildRequires:  junit >= 0:3.8
! BuildRequires:  jakarta-commons-codec >= 0:1.3
! BuildRequires:  jakarta-commons-logging >= 0:1.0.4
! BuildRequires:  log4j >= 0:1.2.8
! BuildRequires:  servlet_2_4_api
! BuildRequires:  xalan-j2 >= 0:2.6.0
! BuildRequires:  xerces-j2 >= 0:2.6.2
! BuildRequires:  xml-commons-jaxp-1.3-apis >= 0:1.3.02
! BuildRequires:  xml-commons-resolver11 >= 0:1.1
! BuildRequires:  xml-security >= 0:1.2.1
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 86,153 ****
  Javadoc for %{name}.
  
! %prep
! %setup -q -n %{name}
! 
! mv java/* .
! rm -rf java
  
! find . -name "*.jar" | xargs rm -f
  
  build-jar-repository endorsed \
! 					xalan-j2 \
! 					xerces-j2 \
! 					xml-commons-apis \
! 					xml-commons-resolver
  
  build-jar-repository lib \
! 					jakarta-commons-codec \
! 					jakarta-commons-logging \
! 					junit \
! 					log4j \
! 					tomcat5-servlet-2.4-api \
! 					wsdl4j \
! 					xalan-j2 \
! 					xml-security
  
  # Uncomment the line below to show output... do we really want to see test 
  # output though? since haltonerror is true, any failed test will abort build 
  # anyways, so it won't be missed.
- 
  #sed -i -e s:'<junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">':'<junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">':g build.xml
  
  %build
! ant dist javadocs
  
  %install
  rm -rf $RPM_BUILD_ROOT
  
  # main package
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 dist/opensaml-1.1.jar \
!     $RPM_BUILD_ROOT%{_javadir}/opensaml-%{version}.jar
! ln -s opensaml-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/opensaml.jar
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
! cp -pr doc/api/* \
!     $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
- 
  %files
  %defattr(0644,root,root,0755)
- %dir %{_javadir}
  %{_javadir}/opensaml-%{version}.jar
  %{_javadir}/opensaml.jar
--- 87,166 ----
  Javadoc for %{name}.
  
! %if %with repolib
! %package repolib
! Summary:        Artifacts to be uploaded to a repository library
! Group:          Development/Libraries/Java
  
! %description repolib
! Artifacts to be uploaded to a repository library.
! This package is not meant to be installed but so its contents
! can be extracted through rpm2cpio.
! %endif
  
+ %prep
+ %setup -q -n %{name}
+ find . -name "*.jar" | xargs -t rm
+ pushd java
  build-jar-repository endorsed \
!                                         xalan-j2 \
!                                         xerces-j2 \
!                                         xml-commons-jaxp-1.3-apis \
!                                         xml-commons-resolver11
  
  build-jar-repository lib \
!                                         jakarta-commons-codec \
!                                         jakarta-commons-logging \
!                                         junit \
!                                         log4j \
!                                         servlet_2_4_api \
!                                         wsdl4j \
!                                         xalan-j2 \
!                                         xml-security
  
  # Uncomment the line below to show output... do we really want to see test 
  # output though? since haltonerror is true, any failed test will abort build 
  # anyways, so it won't be missed.
  #sed -i -e s:'<junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">':'<junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">':g build.xml
+ popd
  
  %build
! pushd java
! export CLASSPATH=
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit`"
! %{ant} dist javadocs
! popd
  
  %install
  rm -rf $RPM_BUILD_ROOT
  
+ pushd java
  # main package
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 dist/opensaml-1.1.jar $RPM_BUILD_ROOT%{_javadir}/opensaml-%{version}.jar
! ln -s opensaml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/opensaml.jar
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
! cp -pr doc/api/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/opensaml.jar
+ %endif
+ popd
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %files
  %defattr(0644,root,root,0755)
  %{_javadir}/opensaml-%{version}.jar
  %{_javadir}/opensaml.jar
***************
*** 156,162 ****
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Mon Jan 16 2006 Deepak Bhole <dbhole at redhat.com> 0:1.1b-1jpp
  - First jpp build.
--- 169,191 ----
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Mon Feb 16 2009 David Walluck <dwalluck at redhat.com> 0:1.1b-2
+ - add repolib
+ - use servlet_2_4_api for (Build)Requires
+ - fix xml-commons (Build)Requires
+ - don't own %%{_javadir}
+ - don't BuildRequires ant-nodeps
+ - correctly set OPT_JAR_LIST
+ - don't move java directory as it misses files
+ - fix mixed-use-of-spaces-and-tabs
+ 
  * Mon Jan 16 2006 Deepak Bhole <dbhole at redhat.com> 0:1.1b-1jpp
  - First jpp build.




More information about the JPackage-commits mailing list