[Jpackage-commits] dist/hawtjni/JPP-6 hawtjni-settings.xml, 1.1, NONE hawtjni.spec, 1.11, 1.12

David Walluck david at ryu.zarb.org
Mon Dec 27 03:51:05 CET 2010


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

Modified Files:
	hawtjni.spec 
Removed Files:
	hawtjni-settings.xml 
Log Message:
- fix example name
- change jar location


--- hawtjni-settings.xml DELETED ---

Index: hawtjni.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hawtjni/JPP-6/hawtjni.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** hawtjni.spec	21 Dec 2010 03:44:18 -0000	1.11
--- hawtjni.spec	27 Dec 2010 02:51:02 -0000	1.12
***************
*** 44,48 ****
  %endif
  
! %global arch_name %{_target_os}_%{_target_cpu}
  
  %define section free
--- 44,48 ----
  %endif
  
! %global arch_name %{_target_os}-%{_target_cpu}
  
  %define section free
***************
*** 50,54 ****
  Name:           hawtjni
  Version:        1.1
! Release:        4%{?dist}
  Epoch:          0
  Summary:        HawtJNI
--- 50,54 ----
  Name:           hawtjni
  Version:        1.1
! Release:        5%{?dist}
  Epoch:          0
  Summary:        HawtJNI
***************
*** 59,64 ****
  # git checkout hawtjni-1.1
  Source0:        %{name}-%{version}.tar.bz2
! Source1:        %{name}-settings.xml
! Source2:        %{name}-jpp-depmap.xml
  Patch0:         hawtjni-plexus-archiver-unarchiver.patch
  Patch1:         hawtjni-pom.patch
--- 59,63 ----
  # git checkout hawtjni-1.1
  Source0:        %{name}-%{version}.tar.bz2
! Source1:        %{name}-jpp-depmap.xml
  Patch0:         hawtjni-plexus-archiver-unarchiver.patch
  Patch1:         hawtjni-pom.patch
***************
*** 143,161 ****
  %patch3 -p0 -b .sav3
  
- cp -p %{SOURCE1} settings.xml
- sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
- sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
- sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
- 
- mkdir -p external_repo
- ln -s %{_javadir} external_repo/JPP
- 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
- export M2_SETTINGS=$(pwd)/settings.xml
  %{_bindir}/mvn-jpp \
!         -e \
!         -s $M2_SETTINGS \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
--- 142,149 ----
  %patch3 -p0 -b .sav3
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  %{_bindir}/mvn-jpp \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
***************
*** 169,210 ****
  rm -rf %{buildroot}
  
! mkdir -p %{buildroot}%{_javadir}
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
  
  %if %with example
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-linux*.jar %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-native-src.zip %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.jar %{buildroot}%{_javadir}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-example.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-example %{version} JPP %{name}-example
  %endif
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.jar %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-generator.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-generator %{version} JPP %{name}-generator
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-pom/%{version}/hawtjni-pom-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-pom.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-pom %{version} JPP %{name}-pom
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.jar %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-runtime.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-runtime %{version} JPP %{name}-runtime
  
! cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.jar %{buildroot}%{_javadir}/
! cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-maven-hawtjni-plugin.pom
! %add_to_maven_depmap org.fusesource.hawtjni maven-hawtjni-plugin %{version} JPP maven-hawtjni-plugin
  
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
  
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %if 0
  # manual
! mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
! cp -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
! rm -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
  %endif
  
--- 157,198 ----
  rm -rf %{buildroot}
  
! %{__mkdir_p} %{buildroot}%{_javadir}/%{name}
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
  
  %if %with example
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-linux*.jar %{buildroot}%{_javadir}/%{name}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-native-src.zip %{buildroot}%{_javadir}/%{name}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-hawtjni-example.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-example %{version} JPP/%{name} hawtjni-example
  %endif
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-hawtjni-generator.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-generator %{version} JPP/%{name} hawtjni-generator
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-pom/%{version}/hawtjni-pom-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-hawtjni-pom.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-pom %{version} JPP/%{name} hawtjni-pom
  
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-hawtjni-runtime.pom
! %add_to_maven_depmap org.fusesource.hawtjni hawtjni-runtime %{version} JPP/%{name} hawtjni-runtime
  
! cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-maven-hawtjni-plugin.pom
! %add_to_maven_depmap org.fusesource.hawtjni maven-hawtjni-plugin %{version} JPP/%{name} maven-hawtjni-plugin
  
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %if 0
  # manual
! %{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
! %{__cp} -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
! %{__rm} -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
  %endif
  
***************
*** 215,219 ****
  
  %clean
! rm -rf %{buildroot}
  
  %post
--- 203,207 ----
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %post
***************
*** 225,247 ****
  %files
  %defattr(0644,root,root,0755)
  %if %with example
! %{_javadir}*/hawtjni-example-%{version}-native-src.zip
! %{_javadir}*/hawtjni-example-native-src.zip
! %{_javadir}*/hawtjni-example-%{version}.jar
! %{_javadir}*/hawtjni-example.jar
  %endif
! %{_javadir}*/maven-hawtjni-plugin-1.1.jar
! %{_javadir}*/maven-hawtjni-plugin.jar
! %{_javadir}*/%{name}-generator-%{version}.jar
! %{_javadir}*/%{name}-generator.jar
! %{_javadir}*/%{name}-runtime-%{version}.jar
! %{_javadir}*/%{name}-runtime.jar
  %if %with example
! %{_datadir}/maven2/poms/JPP-%{name}-example.pom
  %endif
! %{_datadir}/maven2/poms/JPP-%{name}-generator.pom
! %{_datadir}/maven2/poms/JPP-%{name}-pom.pom
! %{_datadir}/maven2/poms/JPP-%{name}-runtime.pom
! %{_datadir}/maven2/poms/JPP-maven-hawtjni-plugin.pom
  %{_mavendepmapfragdir}/%{name}
  
--- 213,237 ----
  %files
  %defattr(0644,root,root,0755)
+ %dir %{_javadir}*/%{name}
+ %exclude %dir %{_javadocdir}/%{name}
  %if %with example
! %{_javadir}*/%{name}/hawtjni-example-%{version}-native-src.zip
! %{_javadir}*/%{name}/hawtjni-example-native-src.zip
! %{_javadir}*/%{name}/hawtjni-example-%{version}.jar
! %{_javadir}*/%{name}/hawtjni-example.jar
  %endif
! %{_javadir}*/%{name}/maven-hawtjni-plugin-%{version}.jar
! %{_javadir}*/%{name}/maven-hawtjni-plugin.jar
! %{_javadir}*/%{name}/hawtjni-generator-%{version}.jar
! %{_javadir}*/%{name}/hawtjni-generator.jar
! %{_javadir}*/%{name}/hawtjni-runtime-%{version}.jar
! %{_javadir}*/%{name}/hawtjni-runtime.jar
  %if %with example
! %{_datadir}/maven2/poms/JPP.%{name}-hawtjni-example.pom
  %endif
! %{_datadir}/maven2/poms/JPP.%{name}-hawtjni-generator.pom
! %{_datadir}/maven2/poms/JPP.%{name}-hawtjni-pom.pom
! %{_datadir}/maven2/poms/JPP.%{name}-hawtjni-runtime.pom
! %{_datadir}/maven2/poms/JPP.%{name}-maven-hawtjni-plugin.pom
  %{_mavendepmapfragdir}/%{name}
  
***************
*** 249,254 ****
  %files example-%{arch_name}
  %defattr(0644,root,root,0755)
! %{_javadir}*/hawtjni-example-%{version}-linux*.jar
! %{_javadir}*/hawtjni-example-linux*.jar
  %endif
  
--- 239,244 ----
  %files example-%{arch_name}
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}/hawtjni-example-%{version}-linux*.jar
! %{_javadir}*/%{name}/hawtjni-example-linux*.jar
  %endif
  
***************
*** 272,275 ****
--- 262,269 ----
  
  %changelog
+ * Mon Jan 03 2011 David Walluck <dwalluck at redhat.com> 0:1.1-5
+ - fix example name
+ - change jar location
+ 
  * Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:1.1-4
  - make this an arch package




More information about the JPackage-commits mailing list