diff --git a/.gitignore b/.gitignore index 4878f03..9f04920 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /byteman-1.5.2-full-clean.tar.gz /byteman-2.0.4.tar.xz /2.1.2.tar.gz +/373601b4e608ea622b2fec947824b99cd0edb124.tar.gz diff --git a/byteman.spec b/byteman.spec index a8d231a..4c47cfd 100644 --- a/byteman.spec +++ b/byteman.spec @@ -1,13 +1,14 @@ %global homedir %{_datadir}/%{name} %global bindir %{homedir}/bin +%global hash 373601b4e608ea622b2fec947824b99cd0edb124 Name: byteman -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.4.1 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman -Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz +Source0: https://github.com/bytemanproject/byteman/archive/%{hash}.tar.gz BuildArch: noarch @@ -34,8 +35,13 @@ Requires: java-devel # Bundling #BuildRequires: java_cup = 1:0.11a-12 #BuildRequires: objectweb-asm = 0:3.3.1-7 -Provides: bundled(java_cup) = 1:0.11a-12 -Provides: bundled(objectweb-asm) = 0:3.3.1-7 +Provides: bundled(java_cup) = 1:0.11a-15 + +%if 0%{?fedora} > 20 +Provides: bundled(objectweb-asm) = 0:5.0-0.2.beta +%else +Provides: bundled(objectweb-asm) = 0:3.3.1-8 +%endif %description Byteman is a tool which simplifies tracing and testing of Java programs. @@ -55,7 +61,7 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%setup -q +%setup -q -n byteman-%{hash} # Fix the gid:aid for java_cup sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" agent/pom.xml @@ -112,6 +118,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %doc docs/copyright.txt %changelog +* Fri Feb 14 2014 Marek Goldmann - 2.1.4.1-1 +- Upstream release 2.1.4.1 + * Sat Aug 03 2013 Fedora Release Engineering - 2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 2367484..579bf24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8a022de5f3d13332f8ca3b61ddc933c 2.1.2.tar.gz +dc505eb23c4cd44a395f74223f83b73a 373601b4e608ea622b2fec947824b99cd0edb124.tar.gz