[Jpackage-commits] dist/opensaml2/devel opensaml2.spec,1.4,1.5

David Walluck david at ryu.zarb.org
Fri Jul 10 18:25:06 CEST 2009


Update of /home/projects/jpackage/cvs/dist/opensaml2/devel
In directory ryu.zarb.org:/tmp/cvs-serv7711

Modified Files:
	opensaml2.spec 
Log Message:
- spec cleanup

Index: opensaml2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/opensaml2/devel/opensaml2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** opensaml2.spec	16 Jun 2009 18:29:14 -0000	1.4
--- opensaml2.spec	10 Jul 2009 16:25:04 -0000	1.5
***************
*** 34,51 ****
  Name:           opensaml2
  Version:        2.2.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Open Source SAML 1.0, 1.1 and 2.0 implementation
! License:        Apache License 2.0
  Group:          Development/Java
  URL:            http://www.opensaml.org/
  Source0:        opensaml2-2.2.3.tar.gz
- # svn export https://svn.middleware.georgetown.edu/java-opensaml2/tags/2.2.3/ opensaml2-2.2.3
- 
  Source1:        opensaml2-jpp-depmap.xml
  Source2:        opensaml2-settings.xml
- 
  Patch0:         opensaml2-pom.patch
- 
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
--- 34,48 ----
  Name:           opensaml2
  Version:        2.2.3
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Open Source SAML 1.0, 1.1 and 2.0 implementation
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://www.opensaml.org/
+ # svn -q export https://svn.middleware.georgetown.edu/java-opensaml2/tags/2.2.3/ opensaml2-2.2.3
  Source0:        opensaml2-2.2.3.tar.gz
  Source1:        opensaml2-jpp-depmap.xml
  Source2:        opensaml2-settings.xml
  Patch0:         opensaml2-pom.patch
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
***************
*** 90,95 ****
  ln -s $(build-classpath xalan-j2) endorsed
  
! %build
! cp %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
--- 87,91 ----
  ln -s $(build-classpath xalan-j2) endorsed
  
! cp -p %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 102,113 ****
  ln -s %{_javadir} external_repo/JPP
  
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
          -Dmaven.test.failure.ignore=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          install javadoc:javadoc
--- 98,110 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.skip=true \
          -Dmaven.test.failure.ignore=true \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          install javadoc:javadoc
***************
*** 119,135 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -m 644 target/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.opensaml %{oname} %{version} JPP %{name}
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  
--- 116,132 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -p -m 644 target/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.opensaml %{oname} %{version} JPP %{name}
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  
***************
*** 145,159 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Tue Jun 16 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.2.3-1.jpp5
  - first release
- 
--- 142,159 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Jul 10 2009 David Walluck <dwalluck at redhat.com> 0:2.2.3-2
+ - spec cleanup
+ 
  * Tue Jun 16 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.2.3-1.jpp5
  - first release




More information about the JPackage-commits mailing list