commit 9fb5389a0567fcb3eae221d8a797cd26bc7ec132
Author: Darryl L. Pierce <mcpierce(a)gmail.com>
Date: Tue Sep 2 09:00:09 2014 -0400
First build for EPEL7.
objectweb-asm3.spec | 53 ++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
---
diff --git a/objectweb-asm3.spec b/objectweb-asm3.spec
index 2b8c25f..8aa3f51 100644
--- a/objectweb-asm3.spec
+++ b/objectweb-asm3.spec
@@ -1,6 +1,6 @@
Name: objectweb-asm3
Version: 3.3.1
-Release: 10%{?dist}.1
+Release: 11%{?dist}
Summary: Java bytecode manipulation and analysis framework
License: BSD
URL:
http://asm.ow2.org/
@@ -12,7 +12,7 @@ Source1:
http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: ant
BuildRequires: maven-local
# shade-jar utility used in this spec file needs this
-# BuildRequires: objectweb-asm3
+BuildRequires: objectweb-asm3
%description
ASM is an all purpose Java bytecode manipulation and analysis
@@ -53,32 +53,36 @@ for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml
asm-all; do
done
# Fix inter-module dependecies in POMs for shaded artifacts
-#pushd output/dist/lib
-#for m in asm-analysis asm-commons asm-util; do
-# %pom_remove_dep :asm-tree ${m}-distroshaded-%{version}.pom
-# %pom_add_dep asm:asm-tree-distroshaded:3.3.1 ${m}-distroshaded-%{version}.pom
-#done
-#%pom_remove_dep :asm-util asm-xml-distroshaded-%{version}.pom
-#%pom_add_dep asm:asm-util-distroshaded:3.3.1 asm-xml-distroshaded-%{version}.pom
-#
-#%pom_remove_dep :asm asm-tree-distroshaded-%{version}.pom
-#%pom_add_dep asm:asm-distroshaded:3.3.1 asm-tree-distroshaded-%{version}.pom
-#popd
-#
-#for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all; do
-# shade-jar org.objectweb.asm org.objectweb.distroshaded.asm
output/dist/lib/${m}-%{version}.jar \
-# output/dist/lib/${m}-distroshaded-%{version}.jar
-# jar xf output/dist/lib/${m}-distroshaded-%{version}.jar META-INF/MANIFEST.MF
-# sed -i /Bundle-/d META-INF/MANIFEST.MF
-# jar ufM output/dist/lib/${m}-distroshaded-%{version}.jar META-INF/MANIFEST.MF
-#done
+%if 0%{?fedora} > 0
+pushd output/dist/lib
+for m in asm-analysis asm-commons asm-util; do
+ %pom_remove_dep :asm-tree ${m}-distroshaded-%{version}.pom
+ %pom_add_dep asm:asm-tree-distroshaded:3.3.1 ${m}-distroshaded-%{version}.pom
+done
+%pom_remove_dep :asm-util asm-xml-distroshaded-%{version}.pom
+%pom_add_dep asm:asm-util-distroshaded:3.3.1 asm-xml-distroshaded-%{version}.pom
+
+%pom_remove_dep :asm asm-tree-distroshaded-%{version}.pom
+%pom_add_dep asm:asm-distroshaded:3.3.1 asm-tree-distroshaded-%{version}.pom
+popd
+
+for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all; do
+ shade-jar org.objectweb.asm org.objectweb.distroshaded.asm
output/dist/lib/${m}-%{version}.jar \
+ output/dist/lib/${m}-distroshaded-%{version}.jar
+ jar xf output/dist/lib/${m}-distroshaded-%{version}.jar META-INF/MANIFEST.MF
+ sed -i /Bundle-/d META-INF/MANIFEST.MF
+ jar ufM output/dist/lib/${m}-distroshaded-%{version}.jar META-INF/MANIFEST.MF
+done
+%endif
%install
%mvn_artifact output/dist/lib/asm-parent-%{version}.pom
for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all; do
-# %mvn_artifact output/dist/lib/${m}-distroshaded-%{version}.pom \
-# output/dist/lib/${m}-distroshaded-%{version}.jar
+%if 0%{?fedora} > 0
+ %mvn_artifact output/dist/lib/${m}-distroshaded-%{version}.pom \
+ output/dist/lib/${m}-distroshaded-%{version}.jar
+%endif
%mvn_artifact output/dist/lib/${m}-%{version}.pom \
output/dist/lib/${m}-%{version}.jar
done
@@ -95,6 +99,9 @@ done
%doc LICENSE.txt
%changelog
+* Tue Sep 2 2014 Darryl L. Pierce <dpierce(a)redhat.com> - 3.3.1-11
+- First build for EPEL7.
+
* Fri Aug 29 2014 Darryl L. Pierce <dpierce(a)redhat.com> - 3.3.1-10.1
- Commented out BR on objectweb-asm3 to enable building on EPEL7.