[Jpackage-commits] dist/wss4j/JPP-6 wss4j-1.5.3-build.patch, 1.1, NONE wss4j-1.5.3-pom.patch, 1.1, NONE wss4j-1.5.3-project.patch, 1.1, NONE wss4j.spec, 1.8, 1.9

David Walluck david at ryu.zarb.org
Mon Feb 15 20:22:29 CET 2010


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

Modified Files:
	wss4j.spec 
Removed Files:
	wss4j-1.5.3-build.patch wss4j-1.5.3-pom.patch 
	wss4j-1.5.3-project.patch 
Log Message:
- always include maven support, even if built by ant
- remove Vendor and Distribution tags
- fix javadoc install
- don't own javadir
- change sources jar name


--- wss4j-1.5.3-pom.patch DELETED ---

--- wss4j-1.5.3-project.patch DELETED ---

--- wss4j-1.5.3-build.patch DELETED ---

Index: wss4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/wss4j/JPP-6/wss4j.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** wss4j.spec	16 Dec 2009 21:36:10 -0000	1.8
--- wss4j.spec	15 Feb 2010 19:22:26 -0000	1.9
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 28,35 ****
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %define section         free
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
--- 28,32 ----
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %define section free
  
  %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
***************
*** 38,43 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
  %bcond_without repolib
- %define without_maven 1
  
  %define repodir %{_javadir}/repository.jboss.com/org/apache/ws/security/%{name}/%{version}-brew
--- 35,40 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
+ %bcond_with maven
  %bcond_without repolib
  
  %define repodir %{_javadir}/repository.jboss.com/org/apache/ws/security/%{name}/%{version}-brew
***************
*** 46,76 ****
  
  Name:           wss4j
- Summary:        Implementation of the OASIS Web Services Security
  Version:        1.5.7
! Release:        2%{?dist}
  Epoch:          0
! 
! URL:            http://ws.apache.org/wss4j/
! License:        Apache License v2.0
  Group:          Development/Libraries/Java
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  Source0:        %{name}-%{version}.tar.gz
! #svn export http://svn.apache.org/repos/asf/webservices/wss4j/tags/1_5_7/ wss4j-1.5.7
! Source1:	%{name}-component-info.xml
! #Source1:        pom-maven2jpp-mapdeps.xsl
! #Source2:        %{name}-jpp-depmap.xml
! 
! #Patch0:         wss4j-1.5.7-build.patch
  Patch1:         wss4j-1.5.7-project.patch
! Patch2:		wss4j-1.5.7-build-merlin.patch
! 
  BuildRequires:  jpackage-utils >= 0:1.7.4
! #BuildRequires:  java-1.5.0-sun-jce-policy
! #BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit
! %if %{with_maven}
  BuildRequires:  maven >= 0:1.1
  BuildRequires:  maven-plugins-base
--- 43,83 ----
  
  Name:           wss4j
  Version:        1.5.7
! Release:        3%{?dist}
  Epoch:          0
! Summary:        Implementation of the OASIS Web Services Security
  Group:          Development/Libraries/Java
! License:        ASL 2.0
! URL:            http://ws.apache.org/wss4j/
! # svn export http://svn.apache.org/repos/asf/webservices/wss4j/tags/1_5_7/ wss4j-1.5.7
  Source0:        %{name}-%{version}.tar.gz
! Source1:        %{name}-component-info.xml
  Patch1:         wss4j-1.5.7-project.patch
! Patch2:         wss4j-1.5.7-build-merlin.patch
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       java >= 0:1.5.0
! Requires:       axis >= 0:1.4
! #Requires:      bouncycastle-provider >= 0:1.37
! Requires:        bouncycastle
! Requires:       jakarta-commons-codec >= 0:1.3
! Requires:       jakarta-commons-discovery >= 0:0.2
! Requires:       jakarta-commons-httpclient >= 0:3.0.1
! Requires:       jakarta-commons-logging >= 0:1.1
! Requires:       log4j >= 0:1.2.8
! Requires:       opensaml >= 0:1.1b
! Requires:       ws-fx-addressing >= 1.0
! Requires:       wsdl4j >= 0:1.6.2
! Requires:       xalan-j2 >= 0:2.7.0
! Requires:       xerces-j2 >= 0:2.9.0
! Requires:       xml-commons-jaxp-1.3-apis
! Requires:       xml-security >= 0:1.3.0
  BuildRequires:  jpackage-utils >= 0:1.7.4
! #BuildRequires: java-1.5.0-sun-jce-policy
! #BuildRequires: java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit
! %if %with maven
  BuildRequires:  maven >= 0:1.1
  BuildRequires:  maven-plugins-base
***************
*** 83,92 ****
  BuildRequires:  maven-plugin-xdoc
  %endif
- 
  BuildRequires:  axis >= 0:1.4
! #BuildRequires:  bouncycastle-provider >= 0:1.37
  BuildRequires:  bouncycastle
! BuildRequires:	glassfish-jaf
! BuildRequires:	glassfish-javamail
  BuildRequires:  jakarta-commons-codec >= 0:1.3
  BuildRequires:  jakarta-commons-discovery >= 0.2
--- 90,98 ----
  BuildRequires:  maven-plugin-xdoc
  %endif
  BuildRequires:  axis >= 0:1.4
! #BuildRequires: bouncycastle-provider >= 0:1.37
  BuildRequires:  bouncycastle
! BuildRequires:        glassfish-jaf
! BuildRequires:        glassfish-javamail
  BuildRequires:  jakarta-commons-codec >= 0:1.3
  BuildRequires:  jakarta-commons-discovery >= 0.2
***************
*** 101,124 ****
  BuildRequires:  xml-commons-jaxp-1.3-apis
  BuildRequires:  xml-security >= 0:1.3.0
- 
- Requires:       java >= 0:1.5.0
- Requires:       axis >= 0:1.4
- #Requires:       bouncycastle-provider >= 0:1.37
- Requires:	bouncycastle
- Requires:       jakarta-commons-codec >= 0:1.3
- Requires:       jakarta-commons-discovery >= 0:0.2
- Requires:       jakarta-commons-httpclient >= 0:3.0.1
- Requires:       jakarta-commons-logging >= 0:1.1
- Requires:       log4j >= 0:1.2.8
- Requires:       opensaml >= 0:1.1b
- Requires:       ws-fx-addressing >= 1.0
- Requires:       wsdl4j >= 0:1.6.2
- Requires:       xalan-j2 >= 0:2.7.0
- Requires:       xerces-j2 >= 0:2.9.0
- Requires:       xml-commons-jaxp-1.3-apis
- Requires:       xml-security >= 0:1.3.0
- 
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  BuildArch:      noarch
  
  %description 
--- 107,112 ----
  BuildRequires:  xml-commons-jaxp-1.3-apis
  BuildRequires:  xml-security >= 0:1.3.0
  BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description 
***************
*** 150,190 ****
  %prep
  %setup -q 
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! #%patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
  
! # set JAVA_HOME for build-classpath to work properly
! #export JAVA_HOME=%{_jvmdir}/java-1.5.0
! ln -sf $(build-classpath addressing) lib
! ln -sf $(build-classpath axis/axis) lib
! ln -sf $(build-classpath axis/axis-ant) lib
! ln -sf $(build-classpath axis/jaxrpc) lib
! ln -sf $(build-classpath axis/saaj) lib
! #ln -sf $(build-classpath bouncycastle/bcprov) lib
! ln -sf $(build-classpath bcprov) lib
! ln -sf $(build-classpath commons-codec) lib
! ln -sf $(build-classpath commons-discovery) lib
! ln -sf $(build-classpath commons-httpclient) lib
! ln -sf $(build-classpath commons-logging) lib
! ln -sf $(build-classpath glassfish-jaf) lib
! ln -sf $(build-classpath glassfish-javamail) lib
! ln -sf $(build-classpath junit) lib
! ln -sf $(build-classpath log4j) lib
! ln -sf $(build-classpath opensaml) lib
! ln -sf $(build-classpath wsdl4j) lib
! ln -sf $(build-classpath xalan-j2) lib
! ln -sf $(build-classpath xalan-j2-serializer) lib
! ln -sf $(build-classpath xml-security) lib
  
! ln -sf $(build-classpath xerces-j2) endorsed
! ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) endorsed
  
  %build
! #export JAVA_HOME=%{_jvmdir}/java-1.5.0
! %if %{without_maven}
! ant jar javadoc
  %else
  mkdir -p target/work
--- 138,172 ----
  %prep
  %setup -q 
! find . -name "*.jar" | xargs -t rm
! %patch1 -p0 -b .sav1
! %patch2 -p0 -b .sav2
  
! ln -s $(build-classpath addressing) lib
! ln -s $(build-classpath axis/axis) lib
! ln -s $(build-classpath axis/axis-ant) lib
! ln -s $(build-classpath axis/jaxrpc) lib
! ln -s $(build-classpath axis/saaj) lib
! #ln -s $(build-classpath bouncycastle/bcprov) lib
! ln -s $(build-classpath bcprov) lib
! ln -s $(build-classpath commons-codec) lib
! ln -s $(build-classpath commons-discovery) lib
! ln -s $(build-classpath commons-httpclient) lib
! ln -s $(build-classpath commons-logging) lib
! ln -s $(build-classpath glassfish-jaf) lib
! ln -s $(build-classpath glassfish-javamail) lib
! ln -s $(build-classpath junit) lib
! ln -s $(build-classpath log4j) lib
! ln -s $(build-classpath opensaml) lib
! ln -s $(build-classpath wsdl4j) lib
! ln -s $(build-classpath xalan-j2) lib
! ln -s $(build-classpath xalan-j2-serializer) lib
! ln -s $(build-classpath xml-security) lib
  
! ln -s $(build-classpath xerces-j2) endorsed
! ln -s $(build-classpath xml-commons-jaxp-1.3-apis) endorsed
  
  %build
! %if %without maven
! %{ant} jar javadoc
  %else
  mkdir -p target/work
***************
*** 208,239 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  # Below statements have name-*.jar because of missing level in version
! %if %{without_maven}
! install -m 644 build/%{name}-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
! install -m 644 target/%{name}-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! %add_to_maven_depmap org.apache.ws.security %{name} %{version} JPP %{name}
  %endif
  
! jar -cf $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-sources.jar -C src/ .
  
! ln -s wss4j-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! ln -s wss4j-%{version}-sources.jar \
!     $RPM_BUILD_ROOT%{_javadir}/%{name}-sources.jar
  
  # 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
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
! %if %{without_maven}
! cp -pr build/doc/html/api/* \
!     $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  %else
! cp -pr target/docs/apidocs/* \
!     $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  %endif
  ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
--- 190,215 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  # Below statements have name-*.jar because of missing level in version
! %if %without maven
! install -p -m 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
! install -p -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
  
! %{jar} -cf $RPM_BUILD_ROOT%{_javadir}/%{name}-sources-%{version}.jar -C src/ .
  
! ln -s wss4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! ln -s wss4j-sources-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-sources.jar
  
  # 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.apache.ws.security %{name} %{version} JPP %{name}
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
! %if %without maven
! cp -pr build/doc/html/api/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  %else
! cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
  %endif
  ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
***************
*** 246,250 ****
  %{__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}
--- 222,225 ----
***************
*** 253,257 ****
  %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
  %{__cp} -p pom.xml %{buildroot}%{repodirlib}/%{name}.pom
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}-sources.jar %{buildroot}%{repodirlib}/%{name}-sources.jar
  %endif
  
--- 228,232 ----
  %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
  %{__cp} -p pom.xml %{buildroot}%{repodirlib}/%{name}.pom
! %{__cp} -p %{buildroot}%{_javadir}/%{name}-sources-%{version}.jar %{buildroot}%{repodirlib}/%{name}-sources.jar
  %endif
  
***************
*** 260,299 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
  %post
- %if %{with_maven}
  %update_maven_depmap
- %endif
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
  
  %postun
- %if %{with_maven}
  %update_maven_depmap
- %endif
  
  %files
  %defattr(0644,root,root,0755)
- %dir %{_javadir}
  %{_javadir}/wss4j-%{version}.jar
  %{_javadir}/wss4j.jar
! %{_javadir}/wss4j-%{version}-sources.jar
  %{_javadir}/wss4j-sources.jar
! %{_datadir}/maven2/poms/*
! %if 0
! #%if %{with_maven}
! %{_mavendepmapfragdir}/*
! %endif
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %if %with repolib
--- 235,257 ----
  rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
  
  %files
  %defattr(0644,root,root,0755)
  %{_javadir}/wss4j-%{version}.jar
  %{_javadir}/wss4j.jar
! %{_javadir}/wss4j-sources-%{version}.jar
  %{_javadir}/wss4j-sources.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %if %with repolib
***************
*** 304,307 ****
--- 262,272 ----
  
  %changelog
+ * Mon Feb 15 2010 David Walluck <dwalluck at redhat.com> 0:1.5.7-3
+ - always include maven support, even if built by ant
+ - remove Vendor and Distribution tags
+ - fix javadoc install
+ - don't own javadir
+ - change sources jar name
+ 
  * Tue Dec 15 2009 Martha Benitez <mbenitez at redhat.com> 0:1.5.7-2
  - Add BR glassfish-jaf, glassfish-javamail




More information about the JPackage-commits mailing list