[openid4java] switch to XMvn
by gil
commit 2f05758be0fcdb55760e40a8217fa920d4b8a3f4
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 22:19:45 2013 +0200
switch to XMvn
openid4java.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/openid4java.spec b/openid4java.spec
index 97460e6..00c53f1 100644
--- a/openid4java.spec
+++ b/openid4java.spec
@@ -33,7 +33,7 @@ BuildRequires: mvn(xerces:xercesImpl)
# test deps
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(net.sf.cglib:cglib)
-BuildRequires: mvn(hsqldb:hsqldb)
+BuildRequires: hsqldb1
BuildRequires: mvn(jdom:jdom)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(log4j:log4j)
10 years, 11 months
[openid4java] switch to XMvn
by gil
commit c55e8a7a1bebc1f3cd804b1d0eec5bb63b920784
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 22:10:21 2013 +0200
switch to XMvn
openid4java.spec | 102 +++++++++++++++++++-----------------------------------
1 files changed, 36 insertions(+), 66 deletions(-)
---
diff --git a/openid4java.spec b/openid4java.spec
index c8085e4..97460e6 100644
--- a/openid4java.spec
+++ b/openid4java.spec
@@ -3,9 +3,8 @@
Name: openid4java
Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: This library allows you to OpenID-enable your Java web-app
-Group: Development/Libraries
License: ASL 2.0
URL: http://code.google.com/p/openid4java/
Source0: http://openid4java.googlecode.com/files/openid4java-%{fullversion}.tar.gz
@@ -14,54 +13,36 @@ Patch0: %{name}-0.9.6.662-ehcache-core.patch
BuildRequires: java-devel
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-logging
-BuildRequires: atinject
-BuildRequires: ehcache-core
-BuildRequires: google-guice
-BuildRequires: httpcomponents-client
-BuildRequires: httpcomponents-core
-BuildRequires: log4j
-BuildRequires: nekohtml
-BuildRequires: springframework
-BuildRequires: springframework-beans
-BuildRequires: springframework-jdbc
-BuildRequires: springframework-tx
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: xerces-j2
+BuildRequires: mvn(com.google.inject:guice)
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(javax.inject:javax.inject)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(net.sf.ehcache:ehcache-core)
+BuildRequires: mvn(net.sourceforge.nekohtml:nekohtml)
+BuildRequires: mvn(org.apache.httpcomponents:httpclient)
+BuildRequires: mvn(org.apache.httpcomponents:httpcore)
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.springframework:spring-beans)
+BuildRequires: mvn(org.springframework:spring-jdbc)
+BuildRequires: mvn(org.springframework:spring-tx)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api)
+BuildRequires: mvn(xerces:xercesImpl)
# test deps
-BuildRequires: apache-commons-io
-BuildRequires: cglib
-BuildRequires: hsqldb
-BuildRequires: jdom
-BuildRequires: junit
-BuildRequires: log4j
+BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(net.sf.cglib:cglib)
+BuildRequires: mvn(hsqldb:hsqldb)
+BuildRequires: mvn(jdom:jdom)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(log4j:log4j)
BuildRequires: xml-commons-apis
BuildRequires: maven-local
BuildRequires: maven-antrun-plugin
BuildRequires: properties-maven-plugin
-Requires: atinject
-Requires: apache-commons-codec
-Requires: apache-commons-logging
-Requires: ehcache-core
-Requires: google-guice
-Requires: httpcomponents-client
-Requires: httpcomponents-core
-Requires: log4j
-Requires: nekohtml
-Requires: springframework
-Requires: springframework-beans
-Requires: springframework-jdbc
-Requires: springframework-tx
-Requires: tomcat-jsp-2.2-api
-Requires: tomcat-servlet-3.0-api
-Requires: xerces-j2
-
-Requires: java
BuildArch: noarch
%description
@@ -69,7 +50,6 @@ OpenID4Java library offers support for OpenID-enabling a
consumer site or implementing an OpenID Provider server.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -141,39 +121,29 @@ rm -r test/src/org/openid4java/consumer/EhcacheNonceVerifierTest.java
%pom_add_dep net.sf.cglib:cglib::test
%build
+
+%mvn_file :%{name} %{name}
+%mvn_file :%{name} %{name}-nodeps
# @ random tests fails
# e.g. Failed tests: testNonceCleanup(org.openid4java.consumer.JdbcNonceVerifierTest): expected:<0> but was:<3>
-mvn-rpmbuild package javadoc:aggregate
-
-%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-(
- cd %{buildroot}%{_javadir}
- ln -sf %{name}.jar %{name}-nodeps.jar
-)
+%mvn_build
-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}
rm -rf target/site/apidocs/javadoc.sh
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%files
-%{_javadir}/%{name}*.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%install
+%mvn_install
+
+%files -f .mfiles
%doc CHANGELOG LICENSE MAINTAINERS README TODO VERSION
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 0.9.8-2
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Fri May 31 2013 gil cattaneo <puntogil(a)libero.it> 0.9.8-1
- update to 0.9.8.741
10 years, 11 months
[mybatis] switch to XMvn
by gil
commit 9984e1868075c87a74cfe849166c9a7e7957807e
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 21:33:18 2013 +0200
switch to XMvn
mybatis.spec | 84 ++++++++++++++++++---------------------------------------
1 files changed, 27 insertions(+), 57 deletions(-)
---
diff --git a/mybatis.spec b/mybatis.spec
index c886898..5570cac 100644
--- a/mybatis.spec
+++ b/mybatis.spec
@@ -1,68 +1,47 @@
Name: mybatis
Version: 3.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: SQL Mapping Framework for Java
-Group: Development/Libraries
License: ASL 2.0
# http://code.google.com/p/mybatis/
URL: http://www.mybatis.org/
-# git clone git://github.com/mybatis/mybatis-3.git mybatis-3.2.2
-# (cd mybatis-3.2.2/ && git archive --format=tar --prefix=mybatis-3.2.2/ mybatis-3.2.2 | xz > ../mybatis-3.2.2-src-git.tar.xz)
Source0: https://github.com/mybatis/mybatis-3/archive/%{name}-%{version}.tar.gz
# thanks to jhernand
# replace ognl ognl with apache-commons-ognl
Patch0: %{name}-%{version}-commons-ognl.patch
BuildRequires: java-devel
-BuildRequires: mybatis-parent
-
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-ognl
-BuildRequires: cglib
-BuildRequires: javassist
-BuildRequires: log4j
-BuildRequires: slf4j
+BuildRequires: mvn(cglib:cglib)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.apache.commons:commons-ognl)
+BuildRequires: mvn(org.javassist:javassist)
+BuildRequires: mvn(org.mybatis:mybatis-parent)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-%if %{?fedora} > 18
-BuildRequires: geronimo-parent-poms
-%endif
-
# test deps
-BuildRequires: junit
BuildRequires: mvn(commons-dbcp:commons-dbcp)
-BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.derby:derby)
-# unavailable
-%if 0
-BuildRequires: mvn(org.hsqldb:hsqldb) >= 2.2.9
-%else
+BuildRequires: geronimo-parent-poms
+BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires: mvn(org.apache.velocity:velocity) >= 1.7
+%if %{?fedora} <= 19
BuildRequires: mvn(hsqldb:hsqldb)
+%else
+BuildRequires: mvn(org.hsqldb:hsqldb) >= 2.2.9
%endif
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(postgresql:postgresql)
-BuildRequires: mvn(org.apache.velocity:velocity) >= 1.7
-
-Requires: apache-commons-logging
-Requires: apache-commons-ognl
-Requires: cglib
-Requires: javassist
-Requires: log4j
-Requires: slf4j
-
-Requires: java
BuildArch: noarch
%description
@@ -86,7 +65,6 @@ a team that includes the original creators of the
and continued here.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -102,7 +80,7 @@ This package contains javadoc for %{name}.
%pom_remove_dep javax.transaction:transaction-api
%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::test
-# unavalable test deps hsqldb >= 2.2.9
+%if %{?fedora} <= 19
# adapt for hsqldb 1.x
%pom_remove_dep org.hsqldb:hsqldb
%pom_add_dep hsqldb:hsqldb::test
@@ -119,36 +97,28 @@ rm -r src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.jav
src/test/java/org/apache/ibatis/submitted/multipleiterates/MultipleIteratesTest.java \
src/test/java/org/apache/ibatis/submitted/foreach_map/ForEachMapTest.java \
src/test/java/org/apache/ibatis/submitted/batch_keys/BatchKeysTest.java
-
+%endif
sed -i 's/\r//' LICENSE NOTICE
%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 -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE NOTICE
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 3.2.2-4
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Sat May 11 2013 gil cattaneo <puntogil(a)libero.it> 3.2.2-3
- rebuilt with mybatis-parent
10 years, 11 months
[tycho] Use _jnidir too when building local p2 repo.
by Alexander Kurtakov
commit debb161fee1453f4a444fa23f9f9e73f79844994
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jul 5 17:14:12 2013 +0300
Use _jnidir too when building local p2 repo.
copy-platform-all | 10 ++++++++++
tycho.spec | 5 ++++-
2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 4c556dc..6ba3f2a 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -9,6 +9,7 @@ eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse
datadir=$prefix/usr/share/eclipse
javadir=$prefix/usr/share/java
+jnidir=$prefix/usr/lib/java
tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip
mkdir -p $sdk/plugins $sdk/features
@@ -91,6 +92,15 @@ for p in $(find $javadir -name "*.jar"); do
id=$((${id} + 1))
fi
done
+id=1
+for p in $(find $jnidir -name "*.jar"); do
+ unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
+ if [ $? = 0 ]; then
+ plugin=${id}-$(basename $p)
+ [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
+ id=$((${id} + 1))
+ fi
+done
popd
diff --git a/tycho.spec b/tycho.spec
index e0e4ce9..ec12e78 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -284,6 +284,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Fri Jul 5 2013 Alexander Kurtakov <akurtako(a)redhat.com> 0.18.0-3
+- Use _jnidir too when building local p2 repo.
+
* Thu Jun 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.18.0-2
- Add Requires on plugins present in Maven super POM
- Resolves: rhbz#971301
10 years, 11 months
[glassfish-master-pom] switch to XMvn
by gil
commit 3fc1e46bc09efe8f206b2a86007fa549fa277c8f
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 10:56:44 2013 +0200
switch to XMvn
glassfish-master-pom.spec | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/glassfish-master-pom.spec b/glassfish-master-pom.spec
index d27ca12..61fd387 100644
--- a/glassfish-master-pom.spec
+++ b/glassfish-master-pom.spec
@@ -1,8 +1,7 @@
Name: glassfish-master-pom
Version: 8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Master POM for Glassfish Maven projects
-Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
URL: http://glassfish.java.net/
# svn export https://svn.java.net/svn/glassfish~svn/tags/master-pom-8/ glassfish-master-pom-8
@@ -14,7 +13,6 @@ Source1: glassfish-LICENSE.txt
BuildRequires: java-devel
BuildRequires: maven-local
-Requires: java
BuildArch: noarch
%description
@@ -29,22 +27,20 @@ cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
%build
-# Nothing to do
-%install
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
+%mvn_build
-%check
-mvn-rpmbuild verify
+%install
+%mvn_install
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 8-3
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu May 02 2013 gil cattaneo <puntogil(a)libero.it> 8-2
- fixed license tag
10 years, 11 months
[mckoi] switch to XMvn
by gil
commit e387f23644ab5f9cd72b373ec9f65db5569f8d32
Author: gil <puntogil(a)libero.it>
Date: Fri Jul 5 10:39:30 2013 +0200
switch to XMvn
mckoi.spec | 55 +++++++++++++++----------------------------------------
1 files changed, 15 insertions(+), 40 deletions(-)
---
diff --git a/mckoi.spec b/mckoi.spec
index 657076f..af7bd06 100644
--- a/mckoi.spec
+++ b/mckoi.spec
@@ -1,33 +1,18 @@
Name: mckoi
Version: 1.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open Source Java SQL Database
-Group: Development/Libraries
License: GPLv2
URL: http://mckoi.com/database/
Source0: http://mckoi.com/database/ver/%{name}%{version}.zip
-
Patch0: %{name}-%{version}-jdk7.patch
-
Patch1: %{name}-%{version}-fix_fsf-address.patch
+BuildRequires: gnu-regexp
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: javacc
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: zip
-
-BuildRequires: gnu-regexp
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -39,15 +24,12 @@ write-ahead-logging. Many of the design ideas implemented in this project
were carried through into MckoiDDB, the evolution of this project.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%package demos
-Group: Development/Libraries
Summary: Demonstrations and samples for %{name}
Requires: %{name} = %{version}-%{release}
Requires: gnu-regexp
@@ -80,21 +62,12 @@ javacc.sh SQL.jj
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file :MckoiSQLDB %{name}
+%mvn_file :MckoiSQLDB MckoiSQLDB
-%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/MckoiSQLDB-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-( cd %{buildroot}%{_javadir} && ln -s %{name}.jar MckoiSQLDB.jar )
+%mvn_build
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "mckoi:mckoi"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
mkdir -p %{buildroot}%{_datadir}/%{name}
(
@@ -106,19 +79,17 @@ cp -pr contrib %{buildroot}%{_datadir}/%{name}
cp -pr demo %{buildroot}%{_datadir}/%{name}
cp -pr test %{buildroot}%{_datadir}/%{name}
+%mvn_install
+
+
%check
cd test
sh ./runLocalTest.sh
-%files
-%{_javadir}/%{name}.jar
-%{_javadir}/MckoiSQLDB.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt README.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%files demos
@@ -126,6 +97,10 @@ sh ./runLocalTest.sh
%doc docs/*
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil(a)libero.it> 1.0.4-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.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 11 months