Attachment 580767 Details for Bug 815394 – cglib 2.2 - 2.2.2 diff

[patch] cglib 2.2 - 2.2.2 diff

cglib-2.2-to-2.2.2.diff (text/plain), 3.87 KB, created by gil cattaneo on 2012-04-27 13:23:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-04-27 13:23:40 UTC

Size: 3.87 KB

patch

obsolete

>    diff --git a/cglib.spec b/cglib.spec
>    index ad6b3b7..8d24a42 100644
>    --- a/cglib.spec
>    +++ b/cglib.spec
>    @@ -1,6 +1,6 @@
>    Name: cglib
>    -Version: 2.2
>    -Release: 9%{?dist}
>    +Version: 2.2.2
>    +Release: 1%{?dist}
>    Summary: Code Generation Library for Java
>    License: ASL 2.0
>    Group: Development/Tools
>    @@ -8,21 +8,23 @@ Url: http://cglib.sourceforge.net/
>    Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.jar
>    Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
>    # Remove the repackaging step that includes other jars into the final thing
>    -Patch0: %{name}-build_xml.patch
>    +Patch0: %{name}-%{version}-build_xml.patch
>    +# add path for objectweb-asm and ant jars
>    +Patch1: %{name}-%{version}-system-jars.patch
>    +# change ant groupId in org.apache.ant
>    +Patch2: %{name}-%{version}-pom.patch
>    -Requires: java >= 0:1.6.0
>    -Requires: objectweb-asm
>    +BuildRequires: java-devel >= 0:1.6.0
>    +BuildRequires: jpackage-utils >= 0:1.5
>    BuildRequires: ant
>    -BuildRequires: jpackage-utils >= 0:1.5
>    -BuildRequires: java-devel >= 0:1.6.0
>    BuildRequires: objectweb-asm
>    -BuildRequires: unzip
>    -BuildArch: noarch
>    -Requires(post): jpackage-utils
>    -Requires(postun): jpackage-utils
>    -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>    +Requires: objectweb-asm
>    +
>    +Requires: java >= 0:1.6.0
>    +Requires: jpackage-utils
>    +BuildArch: noarch
>    %description
>    cglib is a powerful, high performance and quality code generation library
>    @@ -38,45 +40,51 @@ Documentation for the cglib code generation library.
>    %prep
>    %setup -q -c %{name}-%{version}
>    rm lib/*.jar
>    -%patch0 -p1
>    +
>    +%patch0 -p0
>    +%patch1 -p0
>    +cp -pr %{SOURCE1} pom.xml
>    +%patch2 -p0
>    %build
>    -export CLASSPATH=`build-classpath objectweb-asm`
>    +
>    ant jar javadoc
>    %install
>    -rm -rf $RPM_BUILD_ROOT
>    -mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
>    -cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
>    +
>    mkdir -p $RPM_BUILD_ROOT%{_javadir}
>    -cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
>    -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>    +cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>    mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
>    -cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>    -%add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name}
>    -
>    -%clean
>    -rm -rf $RPM_BUILD_ROOT
>    +cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>    +# see https://bugzilla.redhat.com/show_bug.cgi?id=806571
>    +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "net.sf.cglib:cglib"
>    -%post
>    -%update_maven_depmap
>    -
>    -%postun
>    -%update_maven_depmap
>    +mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
>    +cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
>    %files
>    -%defattr(-,root,root,-)
>    %doc LICENSE NOTICE
>    -%{_javadir}/*.jar
>    -%{_mavenpomdir}/*
>    -%config(noreplace) %{_mavendepmapfragdir}/%{name}
>    +%{_javadir}/%{name}.jar
>    +%{_mavenpomdir}/JPP-%{name}.pom
>    +%{_mavendepmapfragdir}/%{name}
>    +
>    +%pre javadoc
>    +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>    +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
>    %files javadoc
>    -%defattr(-,root,root,-)
>    -%{_javadocdir}/%{name}-%{version}
>    +%{_javadocdir}/%{name}
>    +%doc LICENSE
>    %changelog
>    +* Mon Apr 23 2012 gil cattaneo <puntogil@libero.it> 2.2.2-1
>    +- update to 2.2.2
>    +- adapt to current guideline
>    +- remove BuildRequires: unzip
>    +- add %%pre javadoc script
>    +- Resolves rhbz#806571
>    +
>    * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-9
>    - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 815394: 579548 | 579561 | 579562 | 579564 | 579698 | 580767 | 582132 | 582133 | 632020