From d226b278c83bb24c61d3ed35c1a33e0a39b15393 Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Feb 26 2013 13:26:48 +0000 Subject: - Upstream release 2.0.4 - Switched to Maven - Bundling java_cup and objectweb-asm (fpc#226) --- diff --git a/.gitignore b/.gitignore index c1616fa..d9c4a38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /byteman-1.5.2-full-clean.tar.gz +/byteman-2.0.4.tar.xz diff --git a/byteman.spec b/byteman.spec index 499163c..f36a1d1 100644 --- a/byteman.spec +++ b/byteman.spec @@ -1,33 +1,41 @@ Name: byteman -Version: 1.5.2 -Release: 6%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool Group: Development/Libraries License: LGPLv2+ URL: http://www.jboss.org/byteman -# wget http://downloads.jboss.org/%{name}/%{version}/%{name}-%{version}-full-clean.zip -# unzip -q %{name}-%{version}-full-clean.zip -d %{name}-%{version}-full -# rm -rf %{name}-%{version}-full/ext/* -# tar -zcvf %{name}-%{version}-full-clean.tar.gz %{name}-%{version}-full -Source0: %{name}-%{version}-full-clean.tar.gz -Patch0: %{name}-%{version}-buildxml.patch + +# git clone git://github.com/bytemanproject/byteman.git +# cd byteman/ && git archive --format=tar --prefix=byteman-2.0.4/ 2.0.4 | xz > byteman-2.0.4.tar.xz +Source0: byteman-%{version}.tar.xz BuildArch: noarch BuildRequires: jpackage-utils +BuildRequires: javapackages-tools BuildRequires: java-devel -BuildRequires: ant +BuildRequires: maven-local +BuildRequires: maven-shade-plugin +BuildRequires: maven-failsafe-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-testng +BuildRequires: maven-surefire-provider-junit4 +BuildRequires: maven-verifier-plugin BuildRequires: java_cup BuildRequires: jarjar BuildRequires: objectweb-asm BuildRequires: junit4 BuildRequires: testng -Requires: java_cup -Requires: objectweb-asm Requires: jpackage-utils Requires: java +# Bundling +Provides: bundled(java_cup) = 0.11a-12 +Provides: bundled(objectweb-asm) = 3.3.1-5 + %description Byteman is a tool which simplifies tracing and testing of Java programs. Byteman allows you to insert extra Java code into your application, @@ -48,46 +56,48 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{version}-full -%patch0 -p1 +%setup -q -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; +# Fix the gid:aid for java_cup +sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" agent/pom.xml +sed -i "s|java-cup|java_cup|" agent/pom.xml %build -OPT_JAR_LIST="jarjar junit4 testng objectweb-asm java_cup" ant install htdocs -ant -f build-release-pkgs.xml init mvn-repository +%mvn_build %install -# JAR install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} - -install -pm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar -install -pm 644 build/lib/%{name}-install.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-install.jar -install -pm 644 build/lib/%{name}-submit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-submit.jar -install -pm 644 sample/build/lib/%{name}-sample.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-sample.jar -install -pm 644 contrib/bmunit/build/lib/%{name}-bmunit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-bmunit.jar -install -pm 644 contrib/dtest/build/lib/%{name}-dtest.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-dtest.jar - install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -for m in bmunit dtest install sample submit; do +for m in install sample submit; do + # JAR + install -pm 644 ${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar # POM - install -pm 644 workdir/pom-%{name}-${m}.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom + install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom + # DEPMAP + %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar +done +# Contrib +for m in bmunit dtest; do + # JAR + install -pm 644 contrib/${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar + # POM + install -pm 644 contrib/${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom # DEPMAP %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar done +# JAR +install -pm 644 agent/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar # POM -install -pm 644 workdir/pom-%{name}.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom - +install -pm 644 agent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom # DEPMAP %add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar # APIDOCS install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp htdocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files %{_mavenpomdir}/* @@ -100,6 +110,11 @@ cp -rp htdocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc docs/copyright.txt %changelog +* Thu Feb 21 2013 Marek Goldmann - 2.0.4-1 +- Upstream release 2.0.4 +- Switched to Maven +- Bundling java_cup and objectweb-asm (fpc#226) + * Wed Feb 13 2013 Fedora Release Engineering - 1.5.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index f3037b9..bae5cc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef026d7e717f6b86cc0892f9c24db72f byteman-1.5.2-full-clean.tar.gz +75bf4c1694817939f2f6f1e7d9df8a37 byteman-2.0.4.tar.xz