[Jpackage-commits] dist/maven-enforcer/devel maven-enforcer.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Wed Oct 12 18:49:51 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-enforcer/devel
In directory ryu.zarb.org:/tmp/cvs-serv26190

Modified Files:
	maven-enforcer.spec 
Log Message:
- add poms and depmaps to subpackages
- fix Group


Index: maven-enforcer.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-enforcer/devel/maven-enforcer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-enforcer.spec	12 Oct 2011 09:03:10 -0000	1.3
--- maven-enforcer.spec	12 Oct 2011 16:49:49 -0000	1.4
***************
*** 1,31 ****
! %global project_version %{version}
  
  Name:           maven-enforcer
  Version:        1.0.1
! Release:        1%{?dist}
  Summary:        Maven Enforcer
! 
! Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/enforcer
  # svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/1.0.1 maven-enforcer-1.0.1 && tar cjf maven-enforcer-1.0.1.tar.bz2 maven-enforcer-1.0.1
! Source0:        maven-enforcer-%{project_version}.tar.bz2
! Source1:        %{name}-depmap.xml
  Patch0:         fix-site.patch
  Patch1:         enforcer-rules-pom.patch
  # FIXME: we can enable if we can get the right plexuc-container-default to be used
  Patch2:         maven-enforcer-skip-tests.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
- BuildArch: noarch
  
  
! Requires(post):       jpackage-utils
! Requires(postun):     jpackage-utils
  Requires:       java
  Requires:       jpackage-utils
! 
! BuildRequires: java-devel >= 1:1.6.0
! 
  Requires:       jakarta-commons-lang
  BuildRequires:  jakarta-commons-lang
--- 1,28 ----
! %global namedversion %{version}
  
  Name:           maven-enforcer
  Version:        1.0.1
! Release:        2%{?dist}
! Epoch:          0
  Summary:        Maven Enforcer
! Group:          Development/Java
  License:        ASL 2.0
  URL:            http://maven.apache.org/enforcer
  # svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/1.0.1 maven-enforcer-1.0.1 && tar cjf maven-enforcer-1.0.1.tar.bz2 maven-enforcer-1.0.1
! Source0:        maven-enforcer-%{namedversion}.tar.bz2
  Patch0:         fix-site.patch
  Patch1:         enforcer-rules-pom.patch
  # FIXME: we can enable if we can get the right plexuc-container-default to be used
  Patch2:         maven-enforcer-skip-tests.patch
+ BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  
  
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
  Requires:       java
  Requires:       jpackage-utils
! BuildRequires:  java-devel
  Requires:       jakarta-commons-lang
  BuildRequires:  jakarta-commons-lang
***************
*** 48,69 ****
  Requires:       plexus-utils
  BuildRequires:  plexus-utils
! 
! BuildRequires: maven2
! BuildRequires: maven2-common-poms
! BuildRequires: maven-plugin-plugin
! BuildRequires: maven-assembly-plugin
! BuildRequires: maven-compiler-plugin
! BuildRequires: maven-install-plugin
! BuildRequires: maven-javadoc-plugin
! BuildRequires: maven-jar-plugin
! BuildRequires: maven-plugin-plugin
! BuildRequires: maven-plugin-tools-javadoc
! BuildRequires: maven-resources-plugin
! BuildRequires: maven-surefire-maven-plugin
! BuildRequires: maven-plugin-testing-harness
! BuildRequires: mojo-maven2-plugin-cobertura
! BuildRequires: maven-shared-reporting-impl
! BuildRequires: maven-site-plugin
! BuildRequires: plexus-containers-component-javadoc
  
  %description
--- 45,65 ----
  Requires:       plexus-utils
  BuildRequires:  plexus-utils
! BuildRequires:  maven2
! BuildRequires:  maven2-common-poms
! BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-assembly
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-plugin-tools-javadoc
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  cobertura-maven-plugin
! BuildRequires:  maven-shared-reporting-impl
! BuildRequires:  plexus-containers-component-javadoc
  
  %description
***************
*** 79,85 ****
  
  %package api
! Summary: Enforcer API
! Group: Development/Libraries
! Requires: %{name} = %{version}-%{release}
  
  %description api
--- 75,81 ----
  
  %package api
! Summary:        Enforcer API
! Group:          Development/Java
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description api
***************
*** 88,95 ****
  
  %package rules
! Summary: Enforcer Rules
! Group: Development/Libraries
! Requires: %{name} = %{version}-%{release}
! Requires: %{name}-api
  
  %description rules
--- 84,91 ----
  
  %package rules
! Summary:        Enforcer Rules
! Group:          Development/Java
! Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       %{name}-api = %{epoch}:%{version}-%{release}
  
  %description rules
***************
*** 97,111 ****
  
  %package -n maven-enforcer-plugin
! Summary: Enforcer Rules
! Group: Development/Libraries
! Requires: %{name} = %{version}-%{release}
! Requires: %{name}-rules
! Obsoletes: maven2-plugin-enforcer <= 0:2.0.8
! Provides: maven2-plugin-enforcer = 1:%{version}-%{release}
  
  %description -n maven-enforcer-plugin
  This component contains the standard Enforcer Rules.
  
- 
  %prep
  %setup -q
--- 93,106 ----
  
  %package -n maven-enforcer-plugin
! Summary:        Enforcer Rules
! Group:          Development/Java
! Obsoletes:      maven2-plugin-enforcer <= 0:2.0.8
! Provides:       maven2-plugin-enforcer = %{epoch}:%{version}-%{release}
! Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       %{name}-rules = %{epoch}:%{version}-%{release}
  
  %description -n maven-enforcer-plugin
  This component contains the standard Enforcer Rules.
  
  %prep
  %setup -q
***************
*** 115,178 ****
  
  # use new plexus-javadoc taglet replacement
! sed -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
  
  %build
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mvn-jpp \
!         -e \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -Dmaven.test.skip=true \
!         install javadoc:aggregate
  
  %install
! rm -rf %{buildroot}
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}/%{name}
! install -p -m 644 enforcer-api/target/enforcer-api-%{project_version}.jar  \
!  %{buildroot}%{_javadir}/%{name}/enforcer-api-%{project_version}.jar
! install -p -m 644 enforcer-rules/target/enforcer-rules-%{project_version}.jar \
!   %{buildroot}%{_javadir}/%{name}/enforcer-rules-%{project_version}.jar
! install -p -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{project_version}.jar  \
!  %{buildroot}%{_javadir}/%{name}/plugin-%{project_version}.jar
! 
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{project_version}*; \
!     do ln -s ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
  
  # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -pm 644 pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer %{project_version} JPP %{name}
  
! install -pm 644 enforcer-api/pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-api.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{project_version} JPP/%{name} enforcer-api
  
! install -pm 644 enforcer-rules/pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-rules.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{project_version} JPP/%{name} enforcer-rules
  
! install -pm 644 maven-enforcer-plugin/pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{project_version} JPP/%{name} plugin
  
! # javadoc
! #install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! #
! #for dir in *enforcer*; do
! #    install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
! #    cp -pr $dir/target/site/apidocs/* \
! #        %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
! #done
! #
! #ln -s %{name}-%{version} \
! #     $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! 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
--- 110,153 ----
  
  # use new plexus-javadoc taglet replacement
! %{__sed} -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
  
  %build
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  
  %install
! %{__rm} -rf %{buildroot}
  
  # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
! install -p -m 644 enforcer-api/target/enforcer-api-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-api-%{namedversion}.jar
! install -p -m 644 enforcer-rules/target/enforcer-rules-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-rules-%{namedversion}.jar
! install -p -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-enforcer-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
  
  # poms
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
  
! %{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer %{namedversion} JPP enforcer
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer
  
! %{__cp} -p enforcer-api/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer-api.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{namedversion} JPP enforcer-api
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer-api
  
! %{__cp} -p enforcer-rules/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer-rules.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{namedversion} JPP enforcer-rules
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer-rules
  
! %{__cp} -p maven-enforcer-plugin/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-enforcer-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{namedversion} JPP maven-enforcer-plugin
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/maven-enforcer-plugin
  
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %post
***************
*** 186,233 ****
  
  %files
! %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
! 
! %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files api
! %defattr(-,root,root,-)
! %{_javadir}/%{name}/enforcer-api*
  
  %files rules
! %defattr(-,root,root,-)
! %{_javadir}/%{name}/enforcer-rules*
  
  %files -n maven-enforcer-plugin
! %defattr(-,root,root,-)
! %{_javadir}/%{name}/plugin*
  
  %changelog
  * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 1.0.1-1
  - 1.0.1
- 
- * Tue Sep 27 2010 Hui Wang <huwang at redhat.com> - 1.0-0.5.b2
- - Remove redundant BRs
- - Add maven2-common-poms
- 
- * Sun Sep 12 2010 Hui Wang <huwang at redhat.com> - 1.0-0.4.b2
- - Remove pom.patch and use plexus-component-javadoc replace plexus-javadoc
- 
- * Mon Sep 06 2010 Hui Wang <huwang at redhat.com> - 1.0-0.3.b2
- - Rebuild with maven221
- - Add pom.patch and enforcer-rules-pom.patch
- - skip tests
- 
- * Mon Aug 02 2010 Hui Wang <huwang at redhat.com> - 1.0-0.2.b2
- - Change source tarball xz to bz2
- - Fix mavenpomdir
- - Add missing BRs
- - Add maven-enforcer-plugin-pom.patch
- 
- * Wed May 19 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.1.b2
- - Initial package
--- 161,199 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_datadir}/maven2/poms/JPP-enforcer.pom
! %{_mavendepmapfragdir}/enforcer
  
  %files api
! %defattr(0644,root,root,0755)
! %{_javadir}*/enforcer-api-%{namedversion}.jar
! %{_javadir}*/enforcer-api.jar
! %{_datadir}/maven2/poms/JPP-enforcer-api.pom
! %{_mavendepmapfragdir}/enforcer-api
  
  %files rules
! %defattr(0644,root,root,0755)
! %{_javadir}*/enforcer-rules-%{namedversion}.jar
! %{_javadir}*/enforcer-rules.jar
! %{_datadir}/maven2/poms/JPP-enforcer-rules.pom
! %{_mavendepmapfragdir}/enforcer-rules
  
  %files -n maven-enforcer-plugin
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-enforcer-plugin-%{namedversion}.jar
! %{_javadir}*/maven-enforcer-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-enforcer-plugin.pom
! %{_mavendepmapfragdir}/maven-enforcer-plugin
! 
! %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 1.0.1-2
+ - add poms and depmaps to subpackages
+ - fix Group
+ 
  * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 1.0.1-1
  - 1.0.1




More information about the JPackage-commits mailing list