[javassist] Update to upstream version 3.18.1
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Apr 28 14:46:56 UTC 2014
commit c1853c63afe4236ee850bac174dd11446b764c38
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Apr 28 16:08:05 2014 +0200
Update to upstream version 3.18.1
- Remove workaround for rpm bug, can be removed in F-18
- Update to current packaging guidelines
.gitignore | 1 +
javassist.spec | 68 +++++++++++++++++++++++--------------------------------
sources | 2 +-
3 files changed, 31 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c17fa39..0dc19d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ javassist3.9.GA.zip
javassist-3.14.0-GA.zip
javassist-3.15.0-GA.zip
/javassist-3.16.1-GA.zip
+/rel_3_18_1_ga.tar.gz
diff --git a/javassist.spec b/javassist.spec
index 510c8e1..4cde7e4 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,15 +1,20 @@
+%global upstream_version rel_%(sed s/\\\\./_/g <<<"%{version}")_ga
+
Name: javassist
-Version: 3.16.1
-Release: 7%{?dist}
+Version: 3.18.1
+Release: 1%{?dist}
Summary: The Java Programming Assistant provides simple Java bytecode manipulation
Group: Development/Libraries
License: MPLv1.1 or LGPLv2+ or ASL 2.0
-URL: http://www.csg.is.titech.ac.jp/~chiba/javassist/
-Source0: http://downloads.sourceforge.net/jboss/%{name}-%{version}-GA.zip
+URL: http://www.csg.is.titech.ac.jp/~chiba/%{name}/
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
+Source0: http://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz
+
+Patch0: 0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
@@ -23,9 +28,6 @@ BuildRequires: maven-source-plugin
BuildRequires: maven-antrun-plugin
BuildRequires: maven-doxia-sitetools
-Requires: java-headless >= 1:1.6.0
-Requires: jpackage-utils
-
%description
Javassist enables Java programs to define a new class at runtime and to
modify a class file when the JVM loads it. Unlike other similar
@@ -47,47 +49,35 @@ Requires: jpackage-utils
javassist development documentation.
%prep
-%setup -q -n %{name}-%{version}-GA
-
-mkdir runtest
+%setup -q -n %{name}-%{upstream_version}
find . -name \*.jar -type f -delete
+mkdir runtest
+%patch0 -p1
+%pom_xpath_remove "pom:profile[pom:id='default-tools']"
+%pom_add_dep com.sun:tools
+
+%mvn_file : %{name}
+%mvn_alias : %{name}:%{name}
%build
-mvn-rpmbuild install javadoc:javadoc
+# TODO: enable tests
+%mvn_build -f
%install
+%mvn_install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-# jar
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 target/%{name}-%{version}-GA.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}"
-
-# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-18
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-%files
+%files -f .mfiles
%doc License.html Readme.html
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc License.html
-%{_javadocdir}/%{name}
%changelog
+* Mon Apr 28 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.18.1-1
+- Update to upstream version 3.18.1
+- Remove workaround for rpm bug, can be removed in F-18
+- Update to current packaging guidelines
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.16.1-7
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index 27cc3e6..1d7ddd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28c91ea8bc1af935aa1d867555023d72 javassist-3.16.1-GA.zip
+1d8a0dbf392146f6db0964dec9bf3841 rel_3_18_1_ga.tar.gz
More information about the scm-commits
mailing list