[Jpackage-commits] rpms/free/google-guice google-guice-jpp-depmap.xml, 1.1, 1.2 google-guice-pom.patch, 1.1, 1.2 google-guice-settings.xml, 1.1, NONE google-guice.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Thu Dec 23 18:18:27 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/google-guice
In directory ryu.zarb.org:/tmp/50dao58KkP/rpms/free/google-guice

Modified Files:
	google-guice-jpp-depmap.xml google-guice-pom.patch 
	google-guice.spec 
Removed Files:
	google-guice-settings.xml 
Log Message:
2.0-1.jpp6

Index: google-guice-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice/google-guice-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** google-guice-pom.patch	11 Aug 2008 11:25:06 -0000	1.1
--- google-guice-pom.patch	23 Dec 2010 17:18:25 -0000	1.2
***************
*** 1,5 ****
! --- pom.xml.sav0	2007-02-25 15:54:56.000000000 +0100
! +++ pom.xml	2008-07-17 13:53:58.000000000 +0200
! @@ -9,6 +9,21 @@
     <url>http://maven.apache.org</url>
     <dependencies>
--- 1,11 ----
! --- pom.xml.sav0	2007-02-25 19:07:01.000000000 -0500
! +++ pom.xml	2010-12-23 02:21:52.528279402 -0500
! @@ -4,11 +4,26 @@
!    <groupId>com.google.inject</groupId>
!    <artifactId>guice</artifactId>
!    <packaging>jar</packaging>
! -  <version>1.0-RC2</version>
! +  <version>2.0</version>
!    <name>guice</name>
     <url>http://maven.apache.org</url>
     <dependencies>
***************
*** 12,21 ****
  +      <groupId>org.objectweb.asm</groupId>
  +      <artifactId>asm</artifactId>
! +      <version>3.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>cglib</groupId>
  +      <artifactId>cglib-nodep</artifactId>
! +      <version>2.1_3</version>
  +    </dependency>
  +    <dependency>
--- 18,27 ----
  +      <groupId>org.objectweb.asm</groupId>
  +      <artifactId>asm</artifactId>
! +      <version>3.2</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>cglib</groupId>
  +      <artifactId>cglib-nodep</artifactId>
! +      <version>2.2</version>
  +    </dependency>
  +    <dependency>

Index: google-guice.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice/google-guice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** google-guice.spec	11 Aug 2008 11:25:06 -0000	1.1
--- google-guice.spec	23 Dec 2010 17:18:25 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,55 ****
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section free
  
- Summary:        Dependency Injection Framework
  Name:           google-guice
! Version:        1.0
! Release:        0.RC2.1%{dist}
  Epoch:          0
  Group:          Development/Libraries
! License:        Apache Software License 2.0
  URL:            http://code.google.com/p/google-guice/
! Source0:        http://google-guice.googlecode.com/files/guice-1.0-src.zip
! 
  Source1:        %{name}-jpp-depmap.xml
- Source2:        %{name}-settings.xml
- 
  Patch0:         google-guice-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
--- 29,75 ----
  #
  
! %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_with gcj_support
! %bcond_without repolib
! 
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
! 
! %define namedversion %{version}
  
  %define section free
  
  Name:           google-guice
! Version:        2.0
! Release:        1%{dist}
  Epoch:          0
+ Summary:        Dependency Injection Framework
  Group:          Development/Libraries
! License:        ASL 2.0
  URL:            http://code.google.com/p/google-guice/
! # svn export http://google-guice.googlecode.com/svn/tags/2.0 google-guice-2.0 && tar cjf google-guice-2.0.tar.bz2 google-guice-2.0
! # Exported revision 1465.
! Source0:        google-guice-2.0.tar.bz2
  Source1:        %{name}-jpp-depmap.xml
  Patch0:         google-guice-pom.patch
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       aopalliance >= 0:1.0
! Requires:       cglib >= 0:2.2
! Requires:       java >= 0:1.5.0
! Requires:       jpackage-utils
! Requires:       objectweb-asm >= 0:3.2
! BuildRequires:  aopalliance >= 0:1.0
! BuildRequires:  apache-commons-parent
! BuildRequires:  cglib >= 0:2.2
  BuildRequires:  java-devel >= 0:1.5.0
+ BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
***************
*** 63,83 ****
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
! 
! BuildRequires:  aopalliance
! BuildRequires:  objectweb-asm >= 0:3.0
! 
! Requires:       java >= 0:1.5.0
! Requires:       aopalliance
! Requires:       objectweb-asm >= 0:3.0
! 
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
  %endif
! %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
--- 83,93 ----
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
! %if %with repolib
! BuildRequires:  maven2-plugin-deploy
  %endif
! BuildRequires:  objectweb-asm >= 0:3.2
! %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
  BuildArch:      noarch
  %endif
***************
*** 91,94 ****
--- 101,105 ----
  code will be easier to change, unit test and reuse in other
  contexts.
+ 
  Guice embraces Java's type safe nature, especially when it 
  comes to features introduced in Java 5 such as generics and
***************
*** 101,160 ****
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
! #Requires(post):   /bin/rm,/bin/ln
! #Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
  %prep
! %setup -q  -c
  mkdir -p src/main/java
  mv src/com src/main/java
  
- %patch0 -b .sav0
- 
  %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
- sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml
- 
- mkdir external_repo
- 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
! 
! mvn-jpp -e \
!         -s ${M2SETTINGS} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         install javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
! install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! 
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap com.google.inject guice %{version} JPP %{name}
! 
! install -m 644 target/guice-1.0-RC2.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)
  
  
  # javadoc
! install -d -m 0755 $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} # ghost symlink
  
  %if %{gcj_support}
--- 112,170 ----
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
! Requires:       jpackage-utils
  
  %description javadoc
  %{summary}.
  
+ %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
! %patch0 -b .sav0
! %{_bindir}/find -name \*.jar | %{_bindir}/xargs -t %{__rm}
  mkdir -p src/main/java
  mv src/com src/main/java
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! %{_bindir}/mvn-jpp \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
! %if 0
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
! %endif
!         install javadoc:aggregate
  
  %install
! rm -rf %{buildroot}
  
  # jars
! mkdir -p %{buildroot}%{_javadir}
! install -p -m 644 target/guice-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `/bin/echo ${jar} | sed "s|-%{namedversion}||g"`; done)
  
+ # poms
+ mkdir -p %{buildroot}%{_datadir}/maven2/poms
+ install -p -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %add_to_maven_depmap com.google.inject guice %{namedversion} JPP %{name}
  
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! ln -s %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
! 
! %if %with repolib
! %{_bindir}/mvn-jpp deploy:deploy-file -DpomFile=%{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom -Dfile=%{buildroot}%{_javadir}/%{name}-%{version}.jar \
!     -Durl=file://%{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
! %endif
  
  %if %{gcj_support}
***************
*** 163,176 ****
  
  %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
  
  %post
--- 173,177 ----
  
  %clean
! rm -rf %{buildroot}
  
  %post
***************
*** 194,202 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
--- 195,204 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{namedversion}.jar
! %{_javadir}*/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
***************
*** 204,212 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
  * Mon Aug 11 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.RC2.1.jpp5
  - Initial release
- 
--- 206,223 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
  %{_javadocdir}/%{name}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %dir %{_javadir}*/
+ %{_javadir}*/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:2.0-1
+ - 2.0
+ 
  * Mon Aug 11 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.RC2.1.jpp5
  - Initial release

Index: google-guice-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice/google-guice-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** google-guice-jpp-depmap.xml	11 Aug 2008 11:25:06 -0000	1.1
--- google-guice-jpp-depmap.xml	23 Dec 2010 17:18:25 -0000	1.2
***************
*** 1,41 ****
  <dependencies>
-         <dependency>
-                 <maven>
-                         <groupId>cglib</groupId>
-                         <artifactId>cglib-nodep</artifactId>
-                         <version>2.1_3</version>
-                 </maven>
-                 <jpp>
-                         <groupId>JPP</groupId>
-                         <artifactId>cglib-nodep</artifactId>
-                         <version>2.1.3</version>
-                 </jpp>
-         </dependency>
- 
-         <dependency>
-                 <maven>
-                         <groupId>org.objectweb.asm</groupId>
-                         <artifactId>asm</artifactId>
-                         <version>3.0</version>
-                 </maven>
-                 <jpp>
-                         <groupId>JPP/objectweb-asm</groupId>
-                         <artifactId>asm</artifactId>
-                         <version>3.1</version>
-                 </jpp>
-         </dependency>
- 
-  <dependency>
-    <maven>
-      <groupId>javax.jms</groupId>
-      <artifactId>jms</artifactId>
-      <version>1.1</version>
-    </maven>
-    <jpp>
-      <groupId>JPP</groupId>
-      <artifactId>jms_1_1_api</artifactId>
-      <version>1.1</version>
-    </jpp>
-  </dependency>
- 
  </dependencies>
--- 1,2 ----

--- google-guice-settings.xml DELETED ---




More information about the JPackage-commits mailing list