[Jpackage-commits] rpms/free/asm asm.spec,1.6,1.7

jpackage jpackage at ryu.zarb.org
Sun Dec 5 21:36:14 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/asm
In directory ryu.zarb.org:/tmp/9LjF9w8QIu/rpms/free/asm

Modified Files:
	asm.spec 
Log Message:
1.5.3-8.jpp6

Index: asm.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/asm/asm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** asm.spec	9 Oct 2008 19:04:24 -0000	1.6
--- asm.spec	5 Dec 2010 20:36:12 -0000	1.7
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 50,54 ****
  Name:           asm
  Version:        1.5.3
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Code manipulation tool to implement adaptable systems
--- 50,54 ----
  Name:           asm
  Version:        1.5.3
! Release:        8%{?dist}
  Epoch:          0
  Summary:        Code manipulation tool to implement adaptable systems
***************
*** 67,76 ****
  Source9:        http://repo1.maven.org/maven2/asm/kasm/1.5.3/kasm-1.5.3.pom
  Source10:       asm-component-info.xml
! Requires:       java >= 0:1.5.0
! Requires(post): jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  objectweb-anttask
  %if %{gcj_support}
--- 67,76 ----
  Source9:        http://repo1.maven.org/maven2/asm/kasm/1.5.3/kasm-1.5.3.pom
  Source10:       asm-component-info.xml
! Requires:       java >= 0:1.6.0
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  objectweb-anttask
  %if %{gcj_support}
***************
*** 103,113 ****
  
  %prep
! %setup -q -n %{name}-%{version}
! find . -name "*.jar" -exec rm -f {} \;
  install -p -m 644 %{SOURCE1} .
  install -p -m 644 %{SOURCE2} .
  
- cp -p %{SOURCE10} asm-component-info.xml
- 
  #Fix end of line encoding
  sed -i 's/\r//g' README.txt
--- 103,110 ----
  
  %prep
! %setup -q
  install -p -m 644 %{SOURCE1} .
  install -p -m 644 %{SOURCE2} .
  
  #Fix end of line encoding
  sed -i 's/\r//g' README.txt
***************
*** 127,160 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -m 644 output/dist/lib/asm-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 asm-component-info.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm.pom
! %add_to_maven_depmap %{name} %{name} %{version} JPP/%{name} %{name}
  
! install -m 644 output/dist/lib/asm-analysis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-analysis.pom
! %add_to_maven_depmap %{name} %{name}-analysis %{version} JPP/%{name} %{name}-analysis
  
! install -m 644 output/dist/lib/asm-attrs-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-attrs.pom
! %add_to_maven_depmap %{name} %{name}-attrs %{version} JPP/%{name} %{name}-attrs
  
! install -m 644 output/dist/lib/asm-tree-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-tree.pom
! %add_to_maven_depmap %{name} %{name}-tree %{version} JPP/%{name} %{name}-tree
  
! install -m 644 output/dist/lib/asm-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-util.pom
! %add_to_maven_depmap %{name} %{name}-util %{version} JPP/%{name} %{name}-util
  
! install -m 644 output/dist/lib/asm-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-xml.pom
! %add_to_maven_depmap %{name} %{name}-xml %{version} JPP/%{name} %{name}-xml
  
! install -m 644 output/dist/lib/kasm-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-kasm.pom
! %add_to_maven_depmap %{name} k%{name} %{version} JPP/%{name} k%{name}
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \
! ln -sf ${jar} ${jar/-%{version}/}; done)
  
  # javadoc
--- 124,156 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -p -m 644 output/dist/lib/asm-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm.pom
! %add_to_maven_depmap asm asm %{version} JPP/%{name} asm
  
! install -p -m 644 output/dist/lib/asm-analysis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-analysis.pom
! %add_to_maven_depmap asm asm-analysis %{version} JPP/%{name} asm-analysis
  
! install -p -m 644 output/dist/lib/asm-attrs-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-attrs.pom
! %add_to_maven_depmap asm asm-attrs %{version} JPP/%{name} asm-attrs
  
! install -p -m 644 output/dist/lib/asm-tree-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-tree.pom
! %add_to_maven_depmap asm asm-tree %{version} JPP/%{name} asm-tree
  
! install -p -m 644 output/dist/lib/asm-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-util.pom
! %add_to_maven_depmap asm asm-util %{version} JPP/%{name} asm-util
  
! install -p -m 644 output/dist/lib/asm-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-asm-xml.pom
! %add_to_maven_depmap asm asm-xml %{version} JPP/%{name} asm-xml
  
! install -p -m 644 output/dist/lib/kasm-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -p -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.asm-kasm.pom
! %add_to_maven_depmap asm kasm %{version} JPP/%{name} kasm
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
  
  # javadoc
***************
*** 170,174 ****
  install -d -m 755 $RPM_BUILD_ROOT%{repodir}
  install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 asm-component-info.xml $RPM_BUILD_ROOT%{repodir}/component-info.xml
  sed -i 's/@VERSION@/%{version}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
  tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
--- 166,170 ----
  install -d -m 755 $RPM_BUILD_ROOT%{repodir}
  install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{repodir}/component-info.xml
  sed -i 's/@VERSION@/%{version}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
  tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
***************
*** 206,210 ****
  %dir %{_javadir}/%{name}
  %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/*
  %{_mavendepmapfragdir}/*
  %if %{gcj_support}
--- 202,206 ----
  %dir %{_javadir}/%{name}
  %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  %if %{gcj_support}
***************
*** 215,220 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}
! %{_javadocdir}/%{name}-%{version}
  
  %if %{with_repolib}
--- 211,216 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %if %{with_repolib}
***************
*** 225,228 ****
--- 221,233 ----
  
  %changelog
+ * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.3-8
+ - Adapt to JPP-6
+ 
+ * Tue Dec 09 2008 David Walluck <dwalluck at redhat.com> 0:1.5.3-7
+ - fix asm pom install
+ - fix component-info.xml install
+ - use explicit file list
+ - use asm instead of %%{name} where appropriate
+ 
  * Thu Oct 09 2008 David Walluck <dwalluck at redhat.com> 0:1.5.3-6
  - build for JPackage 5




More information about the JPackage-commits mailing list