[jmapviewer/f19] %mvn_artifact not available on f19, use %add_maven_depmap
by Michael Šimáček
commit 64f74f364e04b826b8497901482802c9bea97e66
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri May 2 18:29:30 2014 +0200
%mvn_artifact not available on f19, use %add_maven_depmap
jmapviewer-template.pom | 8 ++++++++
jmapviewer.spec | 21 ++++++++++++++++-----
2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/jmapviewer-template.pom b/jmapviewer-template.pom
new file mode 100644
index 0000000..3b248c8
--- /dev/null
+++ b/jmapviewer-template.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.openstreetmap</groupId>
+ <artifactId>jmapviewer</artifactId>
+ <version>@VERSION@</version>
+ <description>JMapViewer is a java component which allows to easily integrate an OSM map view into your Java application. https://wiki.openstreetmap.org/wiki/JMapViewer</description>
+</project>
diff --git a/jmapviewer.spec b/jmapviewer.spec
index d706260..29ec027 100644
--- a/jmapviewer.spec
+++ b/jmapviewer.spec
@@ -8,6 +8,7 @@ URL: http://wiki.openstreetmap.org/wiki/JMapViewer
# Patent-free tarball created by jmapviewer-generate-tarball.sh
Source0: jmapviewer-%{version}.tar.xz
Source1: jmapviewer-generate-tarball.sh
+Source2: jmapviewer-template.pom
BuildArch: noarch
@@ -36,19 +37,29 @@ sed -i '/<\/javac>/a \
<javadoc sourcepath="src" destdir="target/site/apidocs/" encoding="UTF-8"\/>
' build.xml
+sed 's/@VERSION@/%{version}/g' %SOURCE2 > pom.xml
+
%build
ant build pack
-%mvn_artifact org.openstreetmap:%{name}:%{version} JMapViewer.jar
-%mvn_file :%{name} JMapViewer
-
%install
-%mvn_install
+install -dm755 %{buildroot}%{_javadir}
+install -pm644 JMapViewer.jar %{buildroot}%{_javadir}/%{name}.jar
+
+install -dm755 %{buildroot}%{_mavenpomdir}
+install -pm644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap
+
+install -dm755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+
%files -f .mfiles
%doc Readme.txt Gpl.txt
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
%doc Gpl.txt
%changelog
10 years
[jortho] Install dictionary as a resource
by Michael Šimáček
commit bd53cea889f3b41661765e21213868b33eac38d7
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri May 2 15:26:33 2014 +0200
Install dictionary as a resource
jortho-template.pom | 1 +
jortho.spec | 11 +++++------
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/jortho-template.pom b/jortho-template.pom
index c17dd2f..d94b477 100644
--- a/jortho-template.pom
+++ b/jortho-template.pom
@@ -21,6 +21,7 @@
<directory>src</directory>
<includes>
<include>**/*.cnf</include>
+ <include>**/*.ortho</include>
<include>**/*.properties</include>
</includes>
<excludes>
diff --git a/jortho.spec b/jortho.spec
index 29734ef..42bab21 100644
--- a/jortho.spec
+++ b/jortho.spec
@@ -1,6 +1,6 @@
Name: jortho
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A spell checker for Java
License: GPLv2+
URL: http://jortho.sourceforge.net/
@@ -35,7 +35,7 @@ find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.zip' -exec rm -f '{}' \;
-unzip %SOURCE1 -d dicts/
+unzip %SOURCE1 -d src/
sed 's/@VERSION@/%{version}/g' %SOURCE2 > pom.xml
@@ -47,17 +47,16 @@ sed 's/@VERSION@/%{version}/g' %SOURCE2 > pom.xml
%install
%mvn_install
-mkdir -p %{buildroot}%{_datadir}/%{name}
-install -pm 644 dicts/dictionary_en.ortho %{buildroot}%{_datadir}/%{name}/
-
%files -f .mfiles
%doc license.txt
%doc manual.html
-%{_datadir}/%{name}
%files javadoc -f .mfiles-javadoc
%doc license.txt
%changelog
+* Fri May 02 2014 Michael Simacek <msimacek(a)redhat.com> - 1.0-2
+- Install dictionary as a resource
+
* Mon Apr 28 2014 Michael Simacek <msimacek(a)redhat.com> - 1.0-1
- Initial version
10 years
[jmapviewer/f19] Initial import
by Michael Šimáček
Summary of changes:
6ab284f... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
10 years
[objectweb-asm] SCL-ize package
by Mat Booth
commit 0da404da511f9c3712b83e60c4150e5abfc822da
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu May 1 14:51:40 2014 +0100
SCL-ize package
.gitignore | 7 +++++--
objectweb-asm.spec | 30 ++++++++++++++++++++----------
2 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aaa8cf8..87f8cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
-asm-*.tar.gz
-/asm-5.0_BETA.tar.gz
/LICENSE-2.0.txt
+/.project
+/.build-*.log
+/*.src.rpm
+/noarch
+/asm-*
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index 504fdfc..07ffa24 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -1,6 +1,9 @@
-Name: objectweb-asm
+%{?scl:%scl_package objectweb-asm}
+%{!?scl:%global pkg_name %{name}}
+
+Name: %{?scl_prefix}objectweb-asm
Version: 5.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java bytecode manipulation and analysis framework
License: BSD
URL: http://asm.ow2.org/
@@ -12,9 +15,10 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: ant
BuildRequires: aqute-bnd
BuildRequires: maven-local
+%{?scl:Requires: %scl_runtime}
-Obsoletes: %{name}4 < 5
-Provides: %{name}4 = %{version}-%{release}
+Obsoletes: %{?scl_prefix}objectweb-asm4 < 5
+Provides: %{?scl_prefix}objectweb-asm4 = %{version}-%{release}
%description
ASM is an all purpose Java bytecode manipulation and analysis
@@ -24,7 +28,7 @@ transformations and analysis algorithms allow to easily assemble
custom complex transformations and code analysis tools.
%package javadoc
-Summary: API documentation for %{name}
+Summary: API documentation for %{pkg_name}
%description javadoc
This package provides %{summary}.
@@ -42,24 +46,30 @@ sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath
%ant -Dobjectweb.ant.tasks.path= jar jdoc
%install
+%{?scl:scl enable %{scl} - <<"EOF"}
%mvn_artifact output/dist/lib/asm-parent-%{version}.pom
for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do
%mvn_artifact output/dist/lib/${m}-%{version}.pom \
output/dist/lib/${m}-%{version}.jar
done
%mvn_install -J output/dist/doc/javadoc/user
+%{?scl:EOF}
-%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true
+%jpackage_script org.objectweb.asm.xml.Processor "" "" %{pkg_name}/asm:%{pkg_name}/asm-attrs:%{pkg_name}/asm-util:%{pkg_name}/asm-xml %{pkg_name}-processor true
%files -f .mfiles
%doc LICENSE.txt README.txt
-%{_bindir}/%{name}-processor
-%dir %{_javadir}/%{name}
+%{_bindir}/%{pkg_name}-processor
+%dir %{_javadir}/%{pkg_name}
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Mon Apr 14 2014 Mat Booth <mat.booth(a)redhat.com> - 5.0.1-2
+- SCL-ize package.
+- Fix bogus dates in changelog.
+
* Mon Mar 24 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 5.0.1-1
- Update to upstream version 5.0.1
@@ -114,10 +124,10 @@ done
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:3.1-6.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Tue Oct 23 2008 David Walluck <dwalluck(a)redhat.com> 0:3.1-5.1
+* Thu Oct 23 2008 David Walluck <dwalluck(a)redhat.com> 0:3.1-5.1
- build for Fedora
-* Tue Oct 23 2008 David Walluck <dwalluck(a)redhat.com> 0:3.1-5
+* Thu Oct 23 2008 David Walluck <dwalluck(a)redhat.com> 0:3.1-5
- add OSGi manifest (Alexander Kurtakov)
* Mon Oct 20 2008 David Walluck <dwalluck(a)redhat.com> 0:3.1-4
10 years
[javapackages-tools/jenkins] Update requires to reflect XMvn 2.0 package split
by Michal Srb
commit 62767d6d0cd9a1153b2115aaaa67842843bd363b
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 2 13:08:13 2014 +0200
Update requires to reflect XMvn 2.0 package split
javapackages-tools.spec | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 607094f..23514f5 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -41,7 +41,12 @@ This package provides macros and scripts to support Java packaging.
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
Requires: maven
-Requires: xmvn >= 1.0.0-0.1
+Requires: xmvn >= 2
+Requires: xmvn-install >= 2
+Requires: xmvn-subst >= 2
+Requires: xmvn-resolve >= 2
+Requires: xmvn-mojo >= 2
+Requires: xmvn-connector-aether >= 2
# We want to use OpenJDK 8 for building packages as it is default
# implementation used in Fedora. Due to YUM bugs and limitations,
# sometimes Java 7 may be installed alone. To workaround this
@@ -87,13 +92,10 @@ This package provides macros and scripts to support packaging Maven artifacts.
Summary: Local mode for Apache Ivy
Requires: %{name} = %{version}-%{release}
Requires: apache-ivy >= 2.3.0-8
-Requires: guava
-Requires: maven
-Requires: plexus-classworlds
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: xbean
-Requires: xmvn >= 1.5
+Requires: xmvn-connector-ivy >= 2
+Requires: xmvn-subst >= 2
+Requires: xmvn-install >= 2
+Requires: xmvn-resolve >= 2
%description -n ivy-local
This package implements local mode fow Apache Ivy, which allows
10 years
[javapackages: 5/5] Move XMvn configuration to main package
by Michal Srb
commit 9f2cc086cce5dffabd9b457b73ba0205e5def9d4
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 2 13:02:00 2014 +0200
Move XMvn configuration to main package
install | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/install b/install
index 9ee3efb..9a54830 100755
--- a/install
+++ b/install
@@ -97,7 +97,6 @@ dir "${mavendepmapfragdir}" # @Deprecated
dir "${mavenmetadatadir}"
dir "${rpmconfigdir}/fileattrs"
-
for ver in 1.5.0 1.6.0 1.7.0 1.8.0; do
dir "${javadir}-${ver}"
dir "${jnidir}-${ver}"
@@ -161,6 +160,14 @@ inst_data depgenerators/fileattrs/javadoc.attr "${rpmconfigdir}/fileattrs"
inst_data etc/javapackages-depmap.xml "${mavendepmapfragdir}"
+inst_data configs/configuration.xml "${m2home}"
+inst_data configs/configuration-rpmbuild.xml "${m2home}"
+inst_data configs/configuration-rpmbuild-raw.xml "${m2home}"
+
+link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml"
+link "${m2home}/configuration-rpmbuild.xml" "${m2home}/configuration-21-rpmbuild.xml"
+link "${m2home}/configuration-rpmbuild-raw.xml" "${m2home}/configuration-21-rpmbuild-raw.xml"
+
exec >files-maven
@@ -192,14 +199,6 @@ inst_data metadata/metadata-org-codehaus-mojo.xml "${sysconfdir}/maven"
inst_exec target/mvn-local "${bindir}"
inst_exec target/mvn-rpmbuild "${bindir}"
-inst_data configs/configuration.xml "${m2home}"
-inst_data configs/configuration-rpmbuild.xml "${m2home}"
-inst_data configs/configuration-rpmbuild-raw.xml "${m2home}"
-
-link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml"
-link "${m2home}/configuration-rpmbuild.xml" "${m2home}/configuration-21-rpmbuild.xml"
-link "${m2home}/configuration-rpmbuild-raw.xml" "${m2home}/configuration-21-rpmbuild-raw.xml"
-
exec >files-ivy
10 years
[javapackages] (5 commits) ...Move XMvn configuration to main package
by Michal Srb
Summary of changes:
2212ed8... [maven_depmap] Add file extension (*)
16278cd... [test] Fix maven_depmap test metadata (*)
4647d98... [maven_depmap] Skip extension if it's "jar" (*)
3254779... [test] Even more tests for maven_depmap (*)
9f2cc08... Move XMvn configuration to main package
(*) This commit already existed in another branch; no separate mail sent
10 years