[Jpackage-commits] rpms/free/objenesis objenesis-jpp-depmap.xml, 1.1, 1.1.2.1 objenesis.spec, 1.1, 1.1.2.1

jpackage jpackage at ryu.zarb.org
Fri Feb 27 18:36:07 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/objenesis
In directory ryu.zarb.org:/tmp/M2yP7BCO3c/rpms/free/objenesis

Modified Files:
      Tag: JPACKAGE-5_0
	objenesis-jpp-depmap.xml objenesis.spec 
Log Message:
1.0-2.jpp5

Index: objenesis-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/objenesis/objenesis-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** objenesis-jpp-depmap.xml	18 Jun 2008 11:08:04 -0000	1.1
--- objenesis-jpp-depmap.xml	27 Feb 2009 17:36:05 -0000	1.1.2.1
***************
*** 13,15 ****
--- 13,28 ----
     </dependency>
  
+    <dependency>
+       <maven>
+          <groupId>xpp3</groupId>
+          <artifactId>xpp3_min</artifactId>
+          <version>1.1.4c</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>xpp3-minimal</artifactId>
+          <version>1.1.3.8</version>
+       </jpp>
+    </dependency>
+ 
  </dependencies>

Index: objenesis.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/objenesis/objenesis.spec,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** objenesis.spec	18 Jun 2008 11:08:04 -0000	1.1
--- objenesis.spec	27 Feb 2009 17:36:05 -0000	1.1.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 36,40 ****
  Name:           objenesis
  Version:        1.0
! Release:        1%{dist}
  Epoch:          0
  Group:          Development/Libraries
--- 36,40 ----
  Name:           objenesis
  Version:        1.0
! Release:        2%{dist}
  Epoch:          0
  Group:          Development/Libraries
***************
*** 49,56 ****
  Patch0:         objenesis-website-pom.patch
  
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
--- 49,54 ----
  Patch0:         objenesis-website-pom.patch
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
***************
*** 66,69 ****
--- 64,68 ----
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
+ BuildRequires:  xpp3-minimal
  BuildRequires:  xsite
  
***************
*** 113,118 ****
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 112,115 ----
***************
*** 143,152 ****
  ln -s %{_javadir} external_repo/JPP
  
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
- 
- 
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
- #export MAVEN_OPTS="-Xmx256M"
  
  mvn-jpp -e \
--- 140,145 ----
***************
*** 203,215 ****
  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
- 
  %post
  %update_maven_depmap
--- 196,199 ----
***************
*** 235,240 ****
  %dir %{_javadir}/%{name}
  %{_javadir}/*.jar
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 219,224 ----
  %dir %{_javadir}/%{name}
  %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 244,249 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %files manual
--- 228,233 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %files manual
***************
*** 252,255 ****
--- 236,243 ----
  
  %changelog
+ * Fri Feb 27 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0-2.jpp5
+ - BR xpp3-minimal and fix depmap accordingly
+ - Disown poms and fragments dirs
+ 
  * Wed Jun 18 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-1.jpp5
  - First release




More information about the JPackage-commits mailing list