[Jpackage-commits] dist/cal10n/devel cal10n-jpp-depmap.xml, NONE, 1.1 cal10n.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Dec 17 21:53:01 CET 2010


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

Modified Files:
	cal10n.spec 
Added Files:
	cal10n-jpp-depmap.xml 
Log Message:
- release (based on fc release 4)

--- NEW FILE: cal10n-jpp-depmap.xml ---
<dependencies>
 <dependency>
   <maven>
     <groupId>org.mortbay.jetty</groupId>
     <artifactId>servlet-api</artifactId>
     <version>2.5-20081211</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>servlet_2_5_api</artifactId>
     <version>2.5</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>com.thoughtworks.qdox</groupId>
     <artifactId>qdox</artifactId>
     <version>1.6.3</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>qdox</artifactId>
     <version>1.12</version>
   </jpp>
 </dependency>
</dependencies>

Index: cal10n.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/cal10n/devel/cal10n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cal10n.spec	17 Dec 2010 18:30:12 -0000	1.1
--- cal10n.spec	17 Dec 2010 20:52:59 -0000	1.2
***************
*** 1,35 ****
  Name:           cal10n
  Version:        0.7.4
! Release:        4%{?dist}
  Summary:        Compiler assisted localization library (CAL10N)
- 
  Group:          Development/Libraries
  License:        MIT
! URL:            http://cal10n.qos.ch
  Source0:        http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
  Patch0:         %{name}-fix-maven.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! BuildArch: noarch
! 
! BuildRequires: junit4
! BuildRequires: java-devel >= 1:1.6.0
! BuildRequires: maven2
! BuildRequires: maven-assembly-plugin
! BuildRequires: maven-compiler-plugin
! BuildRequires: maven-install-plugin
! BuildRequires: maven-jar-plugin
! BuildRequires: maven-javadoc-plugin
! BuildRequires: maven-plugin-plugin
! BuildRequires: maven-resources-plugin
! BuildRequires: maven-source-plugin
! BuildRequires: maven-doxia-sitetools
! BuildRequires: maven-site-plugin
! BuildRequires: maven-surefire-maven-plugin
! BuildRequires: maven-surefire-provider-junit4
! 
! Requires:      java
! Requires(post):   jpackage-utils >= 1.7.3
  Requires(postun): jpackage-utils >= 1.7.3
  
  %description
--- 1,33 ----
  Name:           cal10n
  Version:        0.7.4
! Release:        5%{?dist}
! Epoch:          0
  Summary:        Compiler assisted localization library (CAL10N)
  Group:          Development/Libraries
  License:        MIT
! URL:            http://cal10n.qos.ch/
  Source0:        http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
+ Source1:        %{name}-jpp-depmap.xml
  Patch0:         %{name}-fix-maven.patch
! Requires(post): jpackage-utils >= 1.7.3
  Requires(postun): jpackage-utils >= 1.7.3
+ Requires:       jpackage-utils
+ BuildRequires:  junit4
+ BuildRequires:  java-devel >= 0:1.6.0
+ BuildRequires:  maven2
+ BuildRequires:  maven2-plugin-assembly
+ BuildRequires:  maven2-plugin-compiler
+ BuildRequires:  maven2-plugin-install
+ BuildRequires:  maven2-plugin-jar
+ BuildRequires:  maven2-plugin-javadoc
+ BuildRequires:  maven2-plugin-plugin
+ BuildRequires:  maven2-plugin-resources
+ BuildRequires:  maven2-plugin-source
+ BuildRequires:  maven-doxia-sitetools
+ BuildRequires:  maven2-plugin-site
+ BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit4
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 64,87 ****
  
  %prep
! %setup -q 
! find . -name "*.jar" | xargs rm
! %patch0
  
  %build
! mvn-jpp \
          -e \
!         -Dmaven2.jpp.mode=true \
          -Dmaven.test.failure.ignore=true \
          install javadoc:aggregate
  
  %install
  
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}/%{name}
! install -m 644 cal10n-api/target/cal10n-api-%{version}.jar \
!         %{buildroot}%{_javadir}/%{name}/cal10n-api.jar
! install -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
!         %{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin.jar
! 
  
  %add_to_maven_depmap ch.qos.cal10n cal10n-parent %{version} JPP/%{name} cal10n-parent
--- 62,86 ----
  
  %prep
! %setup -q
! find -type f -name "*.jar" | xargs -t rm
! %patch0 -b .sav0
  
  %build
! %{_bindir}/mvn-jpp \
          -e \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -Dmaven.test.failure.ignore=true \
          install javadoc:aggregate
  
  %install
+ rm -rf %{buildroot}
  
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}/%{name}
! install -p -m 644 cal10n-api/target/cal10n-api-%{version}.jar \
!         %{buildroot}%{_javadir}/%{name}/cal10n-api-%{version}.jar
! install -p -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
!         %{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin-%{version}.jar
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
  
  %add_to_maven_depmap ch.qos.cal10n cal10n-parent %{version} JPP/%{name} cal10n-parent
***************
*** 90,104 ****
  
  # poms
! install -d -m 755 %{buildroot}%{_mavenpomdir}
  install -pm 644 pom.xml \
!     %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
  install -pm 644 cal10n-api/pom.xml \
!     %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
  install -pm 644 maven-cal10n-plugin/pom.xml \
!     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-cal10n-plugin.pom
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
  
  %post
--- 89,104 ----
  
  # poms
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
  install -pm 644 pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-%{name}-parent.pom
  install -pm 644 cal10n-api/pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-%{name}-api.pom
  install -pm 644 maven-cal10n-plugin/pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-maven-cal10n-plugin.pom
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %post
***************
*** 108,153 ****
  %update_maven_depmap
  
- %pre javadoc
- # workaround for rpm bug 646523
- [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
- rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
- 
- 
  %files
! %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/%{name}*.jar
! %{_mavenpomdir}/JPP.%{name}-%{name}-parent*
! %{_mavenpomdir}/JPP.%{name}-%{name}-api*
  %{_mavendepmapfragdir}/%{name}
  
  %files -n maven-cal10n-plugin
! %defattr(-,root,root,-)
! %{_javadir}/%{name}/maven*.jar
! %{_mavenpomdir}/JPP.%{name}-maven*
  
  %files javadoc
! %defattr(-,root,root,-)
  %{_javadocdir}/%{name}
  
  %changelog
! * Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.7.4-4
! - Fix pom filenames (Resolves rhbz#655792)
! - Add several packages to Requires
! - Remove versioned jars and javadocs
! 
! * Wed Sep 8 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.4-3
! - Fix build failure (javadoc:aggregate).
! 
! * Mon Jul 19 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.4-2
! - BR maven-site-plugin.
! 
! * Mon Jul 19 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.4-1
! - Update to 0.7.4.
! 
! * Wed Feb 3 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.2-2
! - Removed not needed external repo definitions.
! - Use _mavenpomdir.
! 
! * Wed Feb 3 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.2-1
! - Initial package
--- 108,132 ----
  %update_maven_depmap
  
  %files
! %defattr(0644,root,root,0755)
! %dir %{_javadir}*/%{name}
! %{_javadir}*/%{name}/cal10n-api.jar
! %{_javadir}*/%{name}/cal10n-api-%{version}.jar
! %{_datadir}/maven2/poms/JPP.%{name}-%{name}-parent.pom
! %{_datadir}/maven2/poms/JPP.%{name}-%{name}-api.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files -n maven-cal10n-plugin
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}/maven-cal10n-plugin-%{version}.jar
! %{_javadir}/%{name}/maven-cal10n-plugin.jar
! %{_datadir}/maven2/poms/JPP.%{name}-maven-cal10n-plugin.pom
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
! * Fri Dec 17 2010 David Walluck <dwalluck at redhat.com> 0:0.7.4-5
! - release (based on fc release 4)




More information about the JPackage-commits mailing list