[native2ascii-maven-plugin] switch to XMvn
by gil
commit 638cfe93fa89eddbe19c86a1380481bbac92f5b1
Author: gil <puntogil(a)libero.it>
Date: Sat Jul 6 00:08:31 2013 +0200
switch to XMvn
native2ascii-maven-plugin.spec | 53 +++++++++++----------------------------
1 files changed, 15 insertions(+), 38 deletions(-)
---
diff --git a/native2ascii-maven-plugin.spec b/native2ascii-maven-plugin.spec
index 1556074..eb9c505 100644
--- a/native2ascii-maven-plugin.spec
+++ b/native2ascii-maven-plugin.spec
@@ -2,42 +2,30 @@
%global namedversion %{version}%{?namedreltag}
Name: native2ascii-maven-plugin
Version: 1.0
-Release: 0.5.beta1%{?dist}
+Release: 0.6.beta1%{?dist}
Summary: Native2Ascii Maven Plugin
-Group: Development/Libraries
License: MIT
URL: http://mojo.codehaus.org/%{name}/
Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/%{name}/%{namedversion}/%...
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: mojo-parent
+
+BuildRequires: mvn(org.codehaus.mojo:mojo-parent)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: junit
+
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-project
-
# requires by javadoc-plugin
BuildRequires: mvn(org.apache.maven.shared:maven-invoker)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
-Requires: maven
-Requires: maven-project
-Requires: mojo-parent
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -46,9 +34,7 @@ supported character encoding to
one with ASCII and/or Unicode escapes.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -59,32 +45,23 @@ This package contains javadoc for %{name}.
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{namedversion}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 1.0-0.6.beta1
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Tue Feb 19 2013 gil cattaneo <puntogil(a)libero.it> 1.0-0.5.beta1
- disabled invoker-plugin in f19
10 years, 11 months
[pegdown] switch to XMvn
by gil
commit 994087c090d791f94c2849f795d8def502e0702d
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:52:27 2013 +0200
switch to XMvn
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aeee8d0..7ec4f79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pegdown-1.1.0-src-git.tar.xz
+/1.1.0.tar.gz
diff --git a/sources b/sources
index a089042..33e6818 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d69c52c690828c9c23f7369aac33f4fa pegdown-1.1.0-src-git.tar.xz
+a0b49f850f4ca055554f0331c88fd5cb 1.1.0.tar.gz
10 years, 11 months
[pegdown] switch to XMvn
by gil
commit e1eb41a7ed6cf44d515934a8a28abed1e24c5d13
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:50:46 2013 +0200
switch to XMvn
pegdown.spec | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
---
diff --git a/pegdown.spec b/pegdown.spec
index c154d3c..a537e7c 100644
--- a/pegdown.spec
+++ b/pegdown.spec
@@ -1,16 +1,12 @@
Name: pegdown
Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java library for Markdown processing
-Group: Development/Libraries
License: ASL 2.0
URL: http://pegdown.org
-# git clone git://github.com/sirthias/pegdown.git pegdown-1.1.0
-# cd pegdown-1.1.0/ && git archive --format=tar --prefix=pegdown-1.1.0/ 1.1.0 | xz > ../pegdown-1.1.0-src-git.tar.xz
-Source0: %{name}-%{version}-src-git.tar.xz
+Source0: https://github.com/sirthias/pegdown/archive/%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: parboiled
# test deps
@@ -18,18 +14,8 @@ BuildRequires: jtidy
BuildRequires: testng
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-testng
-Requires: parboiled
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -37,15 +23,13 @@ A pure-Java Markdown processor based on a parboiled PEG parser
supporting a number of extensions.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
-%setup -q -n pegdown-%{version}
+%setup -q
find . -name "*.class" -delete
find . -name "*.jar" -delete
@@ -56,31 +40,23 @@ rm src/test/java/org/pegdown/PegDownTest.java
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CHANGELOG LICENSE NOTICE README.markdown
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 1.1.0-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 11 months
[osgi-resource-locator] switch to XMvn
by gil
commit 74b3cc34ea02db03cd30acb52ef8d7068248b041
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:40:51 2013 +0200
switch to XMvn
osgi-resource-locator.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/osgi-resource-locator.spec b/osgi-resource-locator.spec
index dbff3d9..9d97efd 100644
--- a/osgi-resource-locator.spec
+++ b/osgi-resource-locator.spec
@@ -1,6 +1,6 @@
Name: osgi-resource-locator
Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OSGi resource locator bundle
License: CDDL or GPLv2 with exceptions
Url: http://hk2.java.net/
@@ -54,5 +54,9 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 1.0.1-2
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Sat Aug 25 2012 gil cattaneo <puntogil(a)libero.it> 1.0.1-1
- initial rpm
\ No newline at end of file
10 years, 11 months
[osgi-resource-locator] switch to XMvn
by gil
commit 1635aa3f706bfd9981a0c0d35496d4b4fa2523d7
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:39:15 2013 +0200
switch to XMvn
osgi-resource-locator.spec | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/osgi-resource-locator.spec b/osgi-resource-locator.spec
index 1a790ca..dbff3d9 100644
--- a/osgi-resource-locator.spec
+++ b/osgi-resource-locator.spec
@@ -2,7 +2,6 @@ Name: osgi-resource-locator
Version: 1.0.1
Release: 1%{?dist}
Summary: OSGi resource locator bundle
-Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
Url: http://hk2.java.net/
# svn export https://svn.java.net/svn/hk2~svn/tags/osgi-resource-locator-1.0.1
@@ -19,18 +18,8 @@ BuildRequires: felix-osgi-core
BuildRequires: glassfish-master-pom
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-Requires: felix-osgi-compendium
-Requires: felix-osgi-core
-Requires: glassfish-master-pom
-
-Requires: java
BuildArch: noarch
%description
@@ -38,7 +27,6 @@ OSGi resource locator bundle - used by various API providers that
rely on META-INF/services mechanism to locate providers.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -53,28 +41,16 @@ sed -i 's/\r//' LICENSE.txt
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 package javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
10 years, 11 months
[mvel] switch to XMvn
by gil
commit d52782b25e6eaf3b8976253aa20947b9e19a23cf
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:31:26 2013 +0200
switch to XMvn
.gitignore | 1 +
mvel.spec | 60 +++++++++++++++++-------------------------------------------
sources | 2 +-
3 files changed, 19 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9a71eb..0d7ef7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mvel-2.0.19.tar.xz
+/mvel2-2.0.19.tar.gz
diff --git a/mvel.spec b/mvel.spec
index 9e33a94..3acb108 100644
--- a/mvel.spec
+++ b/mvel.spec
@@ -1,21 +1,16 @@
-
Name: mvel
Version: 2.0.19
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MVFLEX Expression Language
-Group: Development/Libraries
License: ASL 2.0
Url: http://mvel.codehaus.org/
-# git clone git://github.com/mikebrock/mvel.git mvel2-2.0.18
-# cd mvel-2.0.19/ && git archive --format=tar --prefix=mvel2-2.0.19/ mvel2-2.0.19 | xz > ../mvel2-2.0.19.tar.xz
-Source0: %{name}-%{version}.tar.xz
-Source1: mvel-script
-Patch0: mvel-2.0.19-use-system-asm.patch
+Source0: https://github.com/mikebrock/mvel/archive/%{name}2-%{version}.tar.gz
+Source1: %{name}-script
+Patch0: %{name}-2.0.19-use-system-asm.patch
# remove tests which require internal objectweb-asm libraries
-Patch1: mvel-2.0.19-tests.patch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
+Patch1: %{name}-2.0.19-tests.patch
+BuildRequires: java-devel
BuildRequires: objectweb-asm
# test deps
@@ -23,20 +18,10 @@ BuildRequires: junit
BuildRequires: xstream
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-surefire-report-plugin
-Requires: objectweb-asm
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -45,15 +30,13 @@ provides a plethora of features and is suited for everything from the
smallest property binding and extraction, to full blown scripts.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-%{name}2-%{version}
find . -name "*.jar" -delete
find . -name "*.class" -delete
rm ASM-LICENSE.txt
@@ -66,36 +49,28 @@ sed -i 's/\r//' LICENSE.txt
native2ascii -encoding UTF8 src/main/java/org/mvel2/sh/ShellSession.java src/main/java/org/mvel2/sh/ShellSession.java
%build
+%mvn_file :%{name}2 %{name}
# some test at random fails
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true
%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{name}2-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
-%files
+%files -f .mfiles
%{_bindir}/%{name}
-%{_javadir}/%{name}*.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
%doc LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 2.0.19-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -107,5 +82,4 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat May 26 2012 gil cattaneo <puntogil(a)libero.it> 2.0.19-1
-- initial rpm
-
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index 49ffc81..4658ebb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe3e07aebc680950b028089bd263cb2 mvel-2.0.19.tar.xz
+0cd65dc98aba3041bc3502f73f6d392e mvel2-2.0.19.tar.gz
10 years, 11 months
[bval] switch to XMvn, rebuilt with jaxb2-maven-plugin support
by gil
commit 18975ef7cce7b751c18b18f8c81933b63111a3d6
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 23:08:57 2013 +0200
switch to XMvn, rebuilt with jaxb2-maven-plugin support
bval.spec | 86 ++++++++++++++++++------------------------------------------
1 files changed, 26 insertions(+), 60 deletions(-)
---
diff --git a/bval.spec b/bval.spec
index e77252c..dcd6661 100644
--- a/bval.spec
+++ b/bval.spec
@@ -4,22 +4,16 @@
%global with_guice 0
Name: bval
Version: 0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Apache Bean Validation
-Group: Development/Libraries
License: ASL 2.0
Url: http://bval.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{namedversion}/%{name}-parent-%{named...
-
Patch0: %{name}-0.3-incubating-core-FeaturesCapable.patch
-# change org.codehaus.mojo jaxb2-maven-plugin with maven-jaxb22-plugin
-# change org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final
-Patch1: %{name}-0.4-jsr303-pom.patch
# fix jaxb 2.2 apis
-Patch2: %{name}-0.4-jsr303-fix-jaxb-apis.patch
+Patch1: %{name}-0.4-jsr303-fix-jaxb-apis.patch
BuildRequires: java-devel >= 0:1.7.0
-BuildRequires: jpackage-utils
BuildRequires: apache-commons-beanutils
BuildRequires: apache-commons-lang3
@@ -37,22 +31,8 @@ BuildRequires: xstream
BuildRequires: aopalliance
BuildRequires: atinject
BuildRequires: google-guice
-Requires: aopalliance
-Requires: atinject
-Requires: google-guice
%endif
-Requires: apache-commons-beanutils
-Requires: apache-commons-lang3
-Requires: bean-validation-api
-Requires: freemarker
-Requires: geronimo-validation
-Requires: glassfish-jaxb
-Requires: glassfish-jaxb-api
-Requires: hibernate-jpa-2.0-api
-Requires: slf4j
-Requires: xstream
-
# test deps
BuildRequires: geronimo-osgi-support
BuildRequires: junit
@@ -61,20 +41,12 @@ BuildRequires: mockito
BuildRequires: apache-rat-plugin
BuildRequires: buildnumber-maven-plugin
BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jaxb2-plugin
+BuildRequires: jaxb2-maven-plugin
BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -84,9 +56,7 @@ works on Java SE 5 or later. The initial codebase for the
project was donated to the ASF by a SGA from Agimatec GmbH.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -98,7 +68,6 @@ find . -name "*.jar" -delete
%patch0 -p0
%patch1 -p0
-%patch2 -p0
# Don't use buildnumber-plugin, because jna is required and currently broken in f17
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
@@ -158,6 +127,15 @@ find . -name "*.jar" -delete
<scope>test</scope>
</dependency>' bval-jsr303
+%pom_remove_dep :geronimo-jpa_2.0_spec bval-jsr303
+%pom_xpath_inject "pom:project/pom:dependencies" '
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>' bval-jsr303
+
# unavailable deps
# org.hibernate.jsr303.tck jsr303-tck 1.0.6.GA
# org.jboss.test-harness jboss-test-harness-jboss-as-51 1.0.0
@@ -172,40 +150,28 @@ done
%build
-mvn-rpmbuild -Dri -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
-
-%install
+%mvn_file :%{name}-core %{name}/core
+%mvn_file :%{name}-extras %{name}/extras
+%mvn_file :%{name}-json %{name}/json
+%mvn_file :%{name}-jsr303 %{name}/jsr303
+%mvn_file :%{name}-xstream %{name}/xstream
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
-
-# bundle guice tck
-mkdir -p %{buildroot}%{_javadir}/%{name}
-for m in core \
- extras \
- json \
- jsr303 \
- xstream;do
- install -m 644 %{name}-${m}/target/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
- install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
-%add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
-done
+%mvn_build -- -Dri -Dproject.build.sourceEncoding=UTF-8
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
-%files
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CHANGES.txt LICENSE NOTICE README.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 0.5-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Sun Feb 17 2013 gil cattaneo <puntogil(a)libero.it> 0.5-4
- added missing BR geronimo-parent-poms
10 years, 11 months
[openid4java] switch to XMvn
by gil
commit 988e59dc7018fee46a501592f26345442ad1c2a4
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 22:36:56 2013 +0200
switch to XMvn
openid4java.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/openid4java.spec b/openid4java.spec
index 00c53f1..0b1125e 100644
--- a/openid4java.spec
+++ b/openid4java.spec
@@ -120,6 +120,8 @@ rm -r test/src/org/openid4java/consumer/EhcacheNonceVerifierTest.java
%pom_add_dep commons-io:commons-io::test
%pom_add_dep net.sf.cglib:cglib::test
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hsqldb']/pom:version" "1"
+
%build
%mvn_file :%{name} %{name}
10 years, 11 months