[Jpackage-commits] rpms/free/cglib cglib-2.2.pom, NONE, 1.1 cglib.spec, 1.6, 1.7

jpackage jpackage at ryu.zarb.org
Wed Jul 8 23:02:07 CEST 2009


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

Modified Files:
	cglib.spec 
Added Files:
	cglib-2.2.pom 
Log Message:
2.2-2.jpp6

Index: cglib.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/cglib/cglib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cglib.spec	7 Jul 2009 19:24:53 -0000	1.6
--- cglib.spec	8 Jul 2009 21:02:05 -0000	1.7
***************
*** 35,39 ****
  
  %bcond_without repolib
- %bcond_with hook
  
  %define repodir %{_javadir}/repository.jboss.com/cglib/%{version}-brew
--- 35,38 ----
***************
*** 42,50 ****
  
  %define section free
- %define uscver 2.2
  
  Name:           cglib
  Version:        2.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Code Generation Library
--- 41,48 ----
  
  %define section free
  
  Name:           cglib
  Version:        2.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Code Generation Library
***************
*** 54,60 ****
  Source0:        http://downloads.sourceforge.net/sourceforge/cglib/cglib-src-2.2.jar
  Source1:        cglib-missing-words.txt
! Source2:        cglib-component-info.xml
  Patch0:         cglib-2.2-TestEnhancer.patch
! BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  ant-junit >= 0:1.6
--- 52,64 ----
  Source0:        http://downloads.sourceforge.net/sourceforge/cglib/cglib-src-2.2.jar
  Source1:        cglib-missing-words.txt
! Source2:        cglib-2.2.pom
! Source3:        cglib-component-info.xml
  Patch0:         cglib-2.2-TestEnhancer.patch
! Obsoletes:      %{name}-nohook < %{epoch}:%{version}-%{release}
! Provides:       %{name}-nohook = %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       objectweb-asm >= 0:3.1
! BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  ant-junit >= 0:1.6
***************
*** 62,73 ****
  BuildRequires:  junit
  BuildRequires:  objectweb-asm >= 0:3.1
- %if %with hook
- BuildRequires:  aspectwerkz >= 0:1.0
- %endif
- Requires:       objectweb-asm >= 0:3.1
- %if %with hook
- #Optional:      aspectwerkz >= 0:1.0
- %endif
- Provides:       %{name}-nohook = %{epoch}:%{version}-%{release}
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 66,69 ----
***************
*** 77,86 ****
  Code Generation Library, It is used to extend JAVA 
  classes and implements interfaces at runtime.
- %if 0
- NOTE: To use the Aspectwerks hook (net.sf.cglib.transform.hook.*), make sure
- aspectwerks.jar is in the Classpath (from the 'aspectwerks' RPM)
- NOTE: If you use the cglib.jar you may need to add asm.jar to your ClassPath
- (from the 'objectweb-asm' RPM).  The cglib-nodep.jar includes the ASM classes already.
- %endif
  
  %if %with repolib
--- 73,76 ----
***************
*** 95,106 ****
  %endif
  
- %package nohook
- Summary:        Cglib without aspectwerkz hook
- Group:          Development/Libraries/Java
- Requires:       objectweb-asm >= 0:3.1
- 
- %description nohook
- %{summary}.
- 
  %package javadoc
  Summary:        Javadoc for %{name}
--- 85,88 ----
***************
*** 140,168 ****
  %{__cp} -p %{SOURCE1} src/test/net/sf/cglib/util/words.txt
  
- %if %without hook
- %{__rm} -rf src/proxy/net/sf/cglib/transform/hook/*
- %{__rm} -rf src/test/net/sf/cglib/transform/hook/*
- %endif
- 
  %build
  export CLASSPATH=$(build-classpath objectweb-asm/asm objectweb-asm/asm-commons objectweb-asm/asm-util jarjar junit)
- %if %with hook
- export CLASSPATH=${CLASSPATH}:$(build-classpath aspectwerkz-core)
- %endif
  export OPT_JAR_LIST=:
  %{ant} -Dtest.failonerror=false jar javadoc test
  
- %if %with hook
- %{__mkdir_p} _tmp
- pushd _tmp
-     %{jar} xvf ../dist/%{name}-%{uscver}.jar
-     %{__rm} -rf net/sf/cglib/transform/hook
-     %{jar} cmf META-INF/MANIFEST.MF ../dist/%{name}-nohook-%{uscver}.jar net
- popd
- %{__rm} -r _tmp
- %else
- %{__cp} -p dist/%{name}-%{uscver}.jar dist/%{name}-nohook-%{uscver}.jar
- %endif
- 
  %install
  %{__rm} -rf %{buildroot}
--- 122,130 ----
***************
*** 170,190 ****
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p dist/%{name}-nohook-%{uscver}.jar \
!   %{buildroot}%{_javadir}/%{name}-nohook-%{version}.jar
! %if %with hook
! %{__cp} -p dist/%{name}-%{uscver}.jar \
!   %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__cp} -p dist/%{name}-nodep-%{uscver}.jar \
!   %{buildroot}%{_javadir}/%{name}-nodep-%{version}.jar
! %endif
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # javadoc
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! rmdir docs/api
  %{__cp} -pr docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
! #demo
  %{__mkdir_p} %{buildroot}%{_datadir}/%{name}-%{version}
  %{__cp} -pr src/proxy/samples %{buildroot}%{_datadir}/%{name}-%{version}
--- 132,151 ----
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p dist/cglib-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %{__ln_s} ${jar} `/bin/echo $jar | %{__sed} "s|-%{version}||g"`; done)
! 
! # pom
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap cglib cglib %{version} JPP %{name}
  
  # javadoc
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! # FIXME: (dwalluck): breaks -bi --short-circuit
! %{__rm} -rf docs/api
  %{__cp} -pr docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
! # demo
  %{__mkdir_p} %{buildroot}%{_datadir}/%{name}-%{version}
  %{__cp} -pr src/proxy/samples %{buildroot}%{_datadir}/%{name}-%{version}
***************
*** 193,197 ****
  %{__mkdir_p} %{buildroot}%{repodir}
  %{__mkdir_p} %{buildroot}%{repodirlib}
! %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
  %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
--- 154,158 ----
  %{__mkdir_p} %{buildroot}%{repodir}
  %{__mkdir_p} %{buildroot}%{repodirlib}
! %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{repodir}/component-info.xml
  %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
***************
*** 200,210 ****
  %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
! # Deploy cglib-nodeps.jar as cglib.jar to conform to the existing usage in JBoss
! %if %with hook
! cp -p %{buildroot}%{_javadir}/cglib-nodep.jar %{buildroot}%{repodirlib}/cglib.jar
! %else
! cp -p %{buildroot}%{_javadir}/cglib-nohook.jar %{buildroot}%{repodirlib}/cglib.jar
! %endif
  %endif
  
--- 161,167 ----
  %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{repodirlib}/cglib.jar
  %endif
  
***************
*** 212,216 ****
  %{__rm} -rf %{buildroot}
  
! %if %with hook
  %files
  %defattr(0644,root,root,0755)
--- 169,178 ----
  %{__rm} -rf %{buildroot}
  
! %post
! %update_maven_depmap
! 
! %postun
! %update_maven_depmap
! 
  %files
  %defattr(0644,root,root,0755)
***************
*** 218,230 ****
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_javadir}/%{name}-nodep-%{version}.jar
! %{_javadir}/%{name}-nodep.jar
! %endif
! 
! %files nohook
! %defattr(0644,root,root,0755)
! %doc LICENSE
! %{_javadir}/%{name}-nohook-%{version}.jar
! %{_javadir}/%{name}-nohook.jar
  
  %files javadoc
--- 180,185 ----
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 244,247 ****
--- 199,206 ----
  
  %changelog
+ * Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:2.2-2
+ - remove hook/nohook distinction
+ - add pom
+ 
  * Tue Jul 07 2009 David Walluck <dwalluck at redhat.com> 0:2.2-1
  - 2.2

--- NEW FILE: cglib-2.2.pom ---
<?xml version="1.0"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>cglib</groupId>
  <artifactId>cglib</artifactId>
  <name>Code Generation Library</name>
  <version>2.2</version>
  <url>http://cglib.sourceforge.net/</url>
  <licenses>
    <license>
            <name>ASF 2.0</name>
            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
            <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://cglib.cvs.sourceforge.net/cglib</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>org.objectweb.asm</groupId>
      <artifactId>asm</artifactId>
      <version>3.1</version>
    </dependency>
    <dependency>
      <groupId>org.objectweb.asm</groupId>
      <artifactId>asm-util</artifactId>
      <version>3.1</version>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <optional>true</optional>
    </dependency>
  </dependencies>
</project>




More information about the JPackage-commits mailing list