[Jpackage-commits] dist/jdependency/devel jdependency-jpp-depmap.xml, 1.1, NONE jdependency-pom.patch, 1.1, NONE jdependency.spec, 1.4, 1.5

David Walluck david at ryu.zarb.org
Thu Oct 13 20:38:31 CEST 2011


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

Modified Files:
	jdependency.spec 
Removed Files:
	jdependency-jpp-depmap.xml jdependency-pom.patch 
Log Message:
- add (Build)Requires: objectweb-asm >= 0:3.2
- remove asm patch (now uses standard groupId)
- add repolib option


Index: jdependency.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jdependency/devel/jdependency.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** jdependency.spec	11 Jul 2011 20:27:33 -0000	1.4
--- jdependency.spec	13 Oct 2011 18:38:29 -0000	1.5
***************
*** 27,35 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! #
  
  Name:           jdependency
  Version:        0.6
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Class dependency analysis
--- 27,36 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! 
! %bcond_with repolib
  
  Name:           jdependency
  Version:        0.6
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Class dependency analysis
***************
*** 37,48 ****
  Group:          Development/Java
  URL:            https://github.com/tcurdt/jdependency
- Source0:        %{name}-%{version}.tgz
  # curl -L -o jdependency-0.6.tgz https://github.com/tcurdt/jdependency/tarball/jdependency-0.6
! Source2:        %{name}-jpp-depmap.xml
! Patch0:         %{name}-pom.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
--- 38,52 ----
  Group:          Development/Java
  URL:            https://github.com/tcurdt/jdependency
  # curl -L -o jdependency-0.6.tgz https://github.com/tcurdt/jdependency/tarball/jdependency-0.6
! Source0:        %{name}-%{version}.tgz
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       java >= 0:1.6.0
! Requires:       maven2 >= 0:2.0.8
! Requires:       jakarta-commons-io >= 0:1.3.2
! Requires:       objectweb-asm >= 0:3.2
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
+ BuildRequires:  objectweb-asm >= 0:3.2
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
***************
*** 56,69 ****
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  apache-commons-parent
! BuildRequires:  apache-commons-io
! 
! Requires:  java >= 0:1.6.0
! Requires:  maven2 >= 0:2.0.8
! Requires:  apache-commons-io
! 
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
  BuildArch:      noarch
  
  %description
--- 60,66 ----
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  apache-commons-parent
! BuildRequires:  jakarta-commons-io >= 0:1.3.2
  BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 76,119 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  Javadoc for %{name}.
  
! %prep
! %setup -q -n tcurdt-jdependency-ae4617e/
! %patch0 -b .sav0
  
! %build
  
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  
! mvn-jpp \
!     -e \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!     install javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
! # jars/poms
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! # Copy file and create unversioned symlink
! install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # Copy pom
! install -m 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.vafer jdependency %{version} JPP %{name}
  
  # javadoc
! install -d -m 755 $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}
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 73,127 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
  Javadoc for %{name}.
  
! %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 -n tcurdt-jdependency-ae4617e
  
! %build
! export LC_ALL=en_US.UTF-8
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g -XX:MaxPermSize=128m -Xss1m -Dproject.build.sourceEncoding=UTF-8 -Dfile.encoding=UTF-8"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:javadoc
  
  %install
! rm -rf %{buildroot}
  
! # jars/poms
! install -d -m 755 %{buildroot}%{_javadir}
! install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
  
  # Copy pom
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -p -m 644 pom.xml %{buildroot}/%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.vafer jdependency %{version} JPP %{name}
  
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
! 
! %if %with repolib
! %{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com
! %{__cp} -pr maven2-brew %{buildroot}%{_javadir}/repository.jboss.com
! %endif
  
  %clean
! rm -rf %{buildroot}
  
  %post
***************
*** 124,137 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  
  %changelog
  * Mon Jul 11 2011 Ralph Apel <r.apel at r-apel.de> - 0.6-2
  - (B)R apache-commons-io
--- 132,160 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{version}.jar
! %{_javadir}*/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %dir %{_javadir}
! %exclude %dir %{_javadir}
! %{_javadir}*/repository.jboss.com
! %endif
  
  %changelog
+ * Thu Oct 13 2011 David Walluck <dwalluck at redhat.com> 0:0.6-3
+ - add (Build)Requires: objectweb-asm >= 0:3.2
+ - remove asm patch (now uses standard groupId)
+ - add repolib option
+ 
  * Mon Jul 11 2011 Ralph Apel <r.apel at r-apel.de> - 0.6-2
  - (B)R apache-commons-io
***************
*** 139,141 ****
  * Mon Jul 11 2011 Ralph Apel <r.apel at r-apel.de> - 0.6-1
  - 0.6 first release
- 
--- 162,163 ----

--- jdependency-pom.patch DELETED ---

--- jdependency-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list