[Jpackage-commits] rpms/free/aopalliance aopalliance-component-info.xml, NONE, 1.1.2.2 aopalliance.spec, 1.2, 1.2.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 1 15:03:00 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/aopalliance
In directory ryu.zarb.org:/tmp/OhpOnddyrB/rpms/free/aopalliance

Modified Files:
      Tag: JPACKAGE-5_0
	aopalliance.spec 
Added Files:
      Tag: JPACKAGE-5_0
	aopalliance-component-info.xml 
Log Message:
1.0-6.jpp5

--- NEW FILE: aopalliance-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="aopalliance"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="aopalliance.jar"/>


    <export>
      <include input="aopalliance.jar"/>

    </export>
  </component>
</project>

Index: aopalliance.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/aopalliance/aopalliance.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** aopalliance.spec	4 Jul 2008 10:09:33 -0000	1.2
--- aopalliance.spec	1 Feb 2009 14:02:58 -0000	1.2.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,72 ****
  #
  
  %define section   free
  
  Name:           aopalliance
  Version:        1.0
! Release:        3%{dist}
  Epoch:          0
  Summary:        Java/J2EE AOP standards
- 
  Group:          Development/Libraries/Java
  License:        Public Domain
  URL:            http://aopalliance.sourceforge.net/
- Source0:        aopalliance-src.tar.gz
  # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance login
  # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
  Source1:        http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! #Distribution:   JPackage
! #Vendor:         JPackage Project
! 
! BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
! 
  Requires:       java >= 0:1.5.0
! 
! Requires(post):   jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
  Java/J2EE AOP standards
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  %{summary}.
  
  
  %prep
--- 29,87 ----
  #
  
+ %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_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/%{name}/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section   free
  
  Name:           aopalliance
  Version:        1.0
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Java/J2EE AOP standards
  Group:          Development/Libraries/Java
  License:        Public Domain
  URL:            http://aopalliance.sourceforge.net/
  # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance login
  # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
+ Source0:        aopalliance-src.tar.gz
  Source1:        http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
! Source2:        aopalliance-component-info.xml
  Requires:       java >= 0:1.5.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.5.0
+ BuildRequires:  ant >= 0:1.6.5
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
  Java/J2EE AOP standards
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %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
***************
*** 75,82 ****
  %build
  export CLASSPATH=
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
  ant -Dbuild.sysclasspath=only jar javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 90,96 ----
  %build
  export CLASSPATH=
! export OPT_JAR_LIST=:
  ant -Dbuild.sysclasspath=only jar javadoc
  
  %install
  rm -rf $RPM_BUILD_ROOT
***************
*** 88,92 ****
    $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
--- 102,106 ----
    $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
***************
*** 94,113 ****
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  
  %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
  %update_maven_depmap
--- 108,128 ----
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
+ %if %with repolib
+ %{__install} -d -m 0755 %{buildroot}%{repodir}
+ %{__install} -d -m 0755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 0644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
+ %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
***************
*** 117,132 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  
  %changelog
  * Fri Jul 04 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3.jpp5
  - Import to cvs
--- 132,162 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
  
  %changelog
+ * Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.0-6
+ - Rebuild with java5 for JPP-5
+ 
+ * Tue Jan 20 2009 David Walluck <dwalluck at redhat.com> 0:1.0-5
+ - fix repolib location
+ 
+ * Mon Jan 19 2009 David Walluck <dwalluck at redhat.com> 0:1.0-4
+ - add repolib
+ 
  * Fri Jul 04 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3.jpp5
  - Import to cvs




More information about the JPackage-commits mailing list