[velocity-tools] switch to XMvn
by gil
commit cc24330fc5589c21777d1b0b9da3d52b0e4a0071
Author: gil <puntogil(a)libero.it>
Date: Thu Jul 4 08:12:18 2013 +0200
switch to XMvn
velocity-tools.spec | 136 ++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 78 deletions(-)
---
diff --git a/velocity-tools.spec b/velocity-tools.spec
index aaff017..db5a825 100644
--- a/velocity-tools.spec
+++ b/velocity-tools.spec
@@ -1,78 +1,53 @@
Name: velocity-tools
Version: 2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Collection of useful tools for Velocity template engine
-Group: Development/Libraries
License: ASL 2.0
Url: http://velocity.apache.org/tools/releases/2.0/
Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{version}-s...
-# force tomcat 7.x apis
-Source1: velocity-tools-2.0-depmap
Patch0: %{name}-%{version}-junit4.patch
-# add org.apache.tomcat tomcat-jsp-api 7.0.27
-Patch1: %{name}-%{version}-pom.patch
-Patch2: %{name}-%{version}-dont_copy_test_lib.patch
+Patch1: %{name}-%{version}-dont_copy_test_lib.patch
# servlet 3.0 support thanks to mizdebsk
-Patch3: %{name}-%{version}-servlet.patch
+Patch2: %{name}-%{version}-servlet.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
-BuildRequires: apache-commons-beanutils
-BuildRequires: apache-commons-chain
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-digester
-BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-validator
-BuildRequires: jakarta-oro
-BuildRequires: dom4j
-BuildRequires: sslext
-# core taglib tiles
-BuildRequires: struts
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: velocity
+BuildRequires: mvn(commons-beanutils:commons-beanutils)
+BuildRequires: mvn(commons-chain:commons-chain)
+BuildRequires: mvn(commons-collections:commons-collections)
+BuildRequires: mvn(commons-digester:commons-digester)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(commons-validator:commons-validator)
+BuildRequires: mvn(dom4j:dom4j)
+BuildRequires: mvn(org.apache.struts:struts-core)
+BuildRequires: mvn(org.apache.struts:struts-taglib)
+BuildRequires: mvn(org.apache.struts:struts-tiles)
+BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(oro:oro)
+BuildRequires: mvn(sslext:sslext)
+# required by tomcat-jsp-api
+BuildRequires: mvn(org.apache.tomcat:tomcat-el-api)
# test deps
-# httpunit httpunit 1.6.1
-# org.mortbay.jetty jetty-embedded 6.0.1
-# nekohtml nekohtml 0.9.5
-# rhino js 1.6R5
-# xerces xercesImpl 2.8.1
-# xerces xmlParserAPIs 2.6.2
-BuildRequires: junit
+%if 0
+BuildRequires: mvn(httpunit:httpunit) = 1.6.1
+BuildRequires: mvn(nekohtml:nekohtml) = 0.9.5
+BuildRequires: mvn(org.mortbay.jetty:jetty-embedded) = 6.0.1
+BuildRequires: mvn(rhino:js) = 1.6R5
+BuildRequires: mvn(xerces:xercesImpl) = 2.8.1
+BuildRequires: mvn(xerces:xmlParserAPIs) = 2.6.2
+%endif
+BuildRequires: mvn(junit:junit)
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
-
# required by resources-plugin
-BuildRequires: maven-filtering
+BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
-Requires: apache-commons-beanutils
-Requires: apache-commons-chain
-Requires: apache-commons-collections
-Requires: apache-commons-digester
-Requires: apache-commons-lang
-Requires: apache-commons-logging
-Requires: apache-commons-validator
-Requires: jakarta-oro
-Requires: dom4j
-Requires: sslext
-Requires: struts
-Requires: tomcat-jsp-2.2-api
-Requires: tomcat-servlet-3.0-api
-Requires: velocity
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -85,9 +60,7 @@ web applications (via the VelocityViewTag and
VelocityViewServlet) and integration with Struts 1.x applications.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -97,38 +70,45 @@ This package contains javadoc for %{name}.
find . -name "*.jar" -delete
find . -name "*.class" -delete
%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
+%patch1 -p1
+%patch2 -p0
+
sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt
+# force tomcat 7.x apis
+%pom_remove_dep javax.servlet:servlet-api
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
+%pom_add_dep org.apache.tomcat:tomcat-jsp-api::provided
+# remove non standard build structure
+%pom_xpath_remove "pom:project/pom:build/pom:outputDirectory"
+%pom_xpath_remove "pom:project/pom:build/pom:directory"
+
+%mvn_file :%{name} %{name}
+%mvn_alias :%{name} %{name}:%{name}
+%mvn_alias :%{name} org.apache.velocity:%{name}-generic
+%mvn_alias :%{name} %{name}:%{name}-generic
+%mvn_alias :%{name} %{name}:%{name}-view
+%mvn_alias :%{name} org.apache.velocity:%{name}-view
+
%build
+
# tests skipped. cause: missing dependencies
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 dist/%{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 -a "%{name}:%{name},org.apache.velocity:%{name}-generic,%{name}:%{name}-generic,%{name}:%{name}-view,org.apache.velocity:%{name}-view"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README.txt STATUS WHY_THREE_JARS.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Thu Jul 04 2013 gil cattaneo <puntogil(a)libero.it> 2.0-6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Tue Feb 19 2013 gil cattaneo <puntogil(a)libero.it> 2.0-5
- added maven-filtering as BR
10 years, 11 months
[Bug 981070] New: Keyboard settings are not saved if german keyboard is used as root (e.g.CTRL-F2)
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=981070
Bug ID: 981070
Summary: Keyboard settings are not saved if german keyboard is
used as root (e.g.CTRL-F2)
Product: Fedora
Version: 19
Component: janino
Severity: medium
Priority: unspecified
Assignee: puntogil(a)libero.it
Reporter: stefan998(a)aim.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
puntogil(a)libero.it
Created attachment 768518
--> https://bugzilla.redhat.com/attachment.cgi?id=768518&action=edit
Screenshot keyboard setting
Description of problem:
After installation of Fedora 19 Final, the german keyboard settings in console
(CTRL-F2) are not permanently set.
Version-Release number of selected component (if applicable):
Fedora 19 Final edition
How reproducible:
Steps to Reproduce:
1. Install system-config-keyboard
2. Run application and select german-keyboard settings
3. After setting to german keyboard, close application and restart the computer
Actual results:
After entering the root console again, the us-keyboard is selected again
Expected results:
The german keyboard setting is stored and ready to use
Additional info:
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=Vb5BE7iCDu&a=cc_unsubscribe
10 years, 11 months
[struts] switch to XMvn
by gil
commit a2d935c077fce24ca9f637c7b5f4fcab2ea1a7f8
Author: gil <puntogil(a)libero.it>
Date: Thu Jul 4 01:05:13 2013 +0200
switch to XMvn
struts.spec | 116 +++++++++++++++++++++--------------------------------------
1 files changed, 41 insertions(+), 75 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index 58961d3..73970b8 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,9 +1,8 @@
%global master_version 4
Name: struts
Version: 1.3.10
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Web application framework
-Group: Development/Libraries
License: ASL 2.0
URL: http://struts.apache.org/
# wget http://www.apache.org/dist/struts/source/struts-1.3.10-src.zip
@@ -31,52 +30,26 @@ Patch0: %{name}-%{version}-parent-pom.patch
Patch1: %{name}-%{version}-jboss.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
-BuildRequires: antlr
-BuildRequires: apache-commons-beanutils
-BuildRequires: apache-commons-chain
-BuildRequires: apache-commons-digester
-BuildRequires: apache-commons-fileupload
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-validator
-BuildRequires: bsf
-BuildRequires: jakarta-oro
-BuildRequires: jboss-el-2.2-api
-BuildRequires: jboss-jsf-2.1-api
-BuildRequires: jboss-jsp-2.2-api
-BuildRequires: jboss-jstl-1.2-api
-BuildRequires: jboss-servlet-3.0-api
-# not only a test dep
-BuildRequires: junit
+
+BuildRequires: mvn(antlr:antlr)
+BuildRequires: mvn(commons-beanutils:commons-beanutils)
+BuildRequires: mvn(commons-chain:commons-chain)
+BuildRequires: mvn(commons-digester:commons-digester)
+BuildRequires: mvn(commons-fileupload:commons-fileupload)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(commons-validator:commons-validator)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.bsf:bsf)
+BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_2.2_spec)
+BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec)
+BuildRequires: mvn(org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec)
+BuildRequires: mvn(org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec)
+BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
+BuildRequires: mvn(oro:oro)
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-junit4
-Requires: antlr
-Requires: apache-commons-beanutils
-Requires: apache-commons-chain
-Requires: apache-commons-digester
-Requires: apache-commons-fileupload
-Requires: apache-commons-logging
-Requires: apache-commons-validator
-Requires: bsf
-Requires: jakarta-oro
-Requires: jboss-el-2.2-api
-Requires: jboss-jsf-2.1-api
-Requires: jboss-jsp-2.2-api
-Requires: jboss-jstl-1.2-api
-Requires: jboss-servlet-3.0-api
-Requires: junit
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
Obsoletes: %{name}-manual < %{version}
Obsoletes: %{name}-webapps-tomcat5 < %{version}
@@ -99,9 +72,7 @@ JavaBeans properties based on the Java reflection APIs, and
internationalization of prompts and messages.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -122,50 +93,45 @@ done
cp -p %{SOURCE1} pom.xml
+cd src
+%mvn_file :%{name}-core %{name}/core
+%mvn_file :%{name}-el %{name}/el
+%mvn_file :%{name}-extras %{name}/extras
+%mvn_file :%{name}-faces %{name}/faces
+%mvn_file :%{name}-mailreader-dao %{name}/mailreader-dao
+%mvn_file :%{name}-scripting %{name}/scripting
+%mvn_file :%{name}-taglib %{name}/taglib
+%mvn_file :%{name}-tiles %{name}/tiles
+
%build
cd src
-mvn-rpmbuild \
- -Dproject.build.sourceEncoding=UTF-8 \
- install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
-mkdir -p %{buildroot}%{_mavenpomdir}
+(
+cd src
+%mvn_install
+)
+
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-master.pom
%add_maven_depmap JPP.%{name}-master.pom
-install -pm 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-for m in core \
- el \
- extras \
- faces \
- mailreader-dao \
- scripting \
- taglib \
- tiles; do
- install -pm 644 src/${m}/target/%{name}-${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
- install -pm 644 src/${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
- %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
+%files -f src/.mfiles
+%dir %{_javadir}/%{name}
+%{_mavenpomdir}/JPP.%{name}-master.pom
%{_mavendepmapfragdir}/%{name}
%doc LICENSE.txt NOTICE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f src/.mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jul 03 2013 gil cattaneo <puntogil(a)libero.it> 1.3.10-8
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 11 months
[mybatis-parent] switch to XMvn
by gil
commit b96e7016e56ae9bf4b0989ac7025e1467f01e10c
Author: gil <puntogil(a)libero.it>
Date: Thu Jul 4 00:07:53 2013 +0200
switch to XMvn
mybatis-parent.spec | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
---
diff --git a/mybatis-parent.spec b/mybatis-parent.spec
index 1c695a4..0e8340e 100644
--- a/mybatis-parent.spec
+++ b/mybatis-parent.spec
@@ -1,30 +1,21 @@
Name: mybatis-parent
Version: 18
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The MyBatis parent POM
-Group: Development/Libraries
License: ASL 2.0
URL: http://www.mybatis.org/
-# git clone git://github.com/mybatis/parent.git mybatis-parent-18
-# (cd mybatis-parent-18/ && git archive --format=tar --prefix=mybatis-parent-18/ mybatis-parent-18 | xz > ../mybatis-parent-18-src-git.tar.xz)
Source0: https://github.com/mybatis/parent/archive/%{name}-%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-#BuildRequires: animal-sniffer
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
-#BuildRequires: mojo-signatures
+%if 0
+BuildRequires: mvn(org.codehaus.mojo:animal-sniffer-maven-plugin)
+BuildRequires: mojo-signatures
+%endif
-Requires: maven-enforcer-plugin
-Requires: maven-plugin-bundle
-#Requires: mvn(org.codehaus.mojo:animal-sniffer-maven-plugin)
-#Requires: mojo-signatures
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -63,22 +54,20 @@ The MyBatis parent POM which has to be inherited by all MyBatis modules.
%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-enforcer-plugin']/pom:executions/pom:execution/pom:configuration/pom:rules/pom:requirePluginVersions"
%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 NOTICE README
%changelog
+* Wed Jul 03 2013 gil cattaneo <puntogil(a)libero.it> 18-4
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Sat May 11 2013 gil cattaneo <puntogil(a)libero.it> 18-3
- disable animal-sniffer-maven-plugin
10 years, 11 months
[pax-logging] switch to XMvn
by gil
commit 1babf1dc9f85d4a45c76f938e5ad9fc070b34692
Author: gil <puntogil(a)libero.it>
Date: Wed Jul 3 23:57:36 2013 +0200
switch to XMvn
.gitignore | 1 +
pax-logging.spec | 69 +++++++++++++++--------------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 732cf2d..7a51ec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pax-logging-1.6.9-src-git.tar.xz
+/logging-1.6.9.tar.gz
diff --git a/pax-logging.spec b/pax-logging.spec
index 1855405..5a2b6cf 100644
--- a/pax-logging.spec
+++ b/pax-logging.spec
@@ -1,38 +1,22 @@
Name: pax-logging
Version: 1.6.9
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: OSGi Logging framework implementation
-Group: Development/Libraries
License: ASL 2.0 and BSD and MIT
URL: http://team.ops4j.org/wiki//display/paxlogging/Pax+Logging
-# git clone git://github.com/ops4j/org.ops4j.pax.logging.git pax-logging-1.6.9
-# cd pax-logging-1.6.9 && git archive --format=tar --prefix=pax-logging-1.6.9/ logging-1.6.9 | xz > pax-logging-1.6.9-src-git.tar.xz
-Source0: %{name}-%{version}-src-git.tar.xz
+Source0: https://github.com/ops4j/org.ops4j.pax.logging/archive/logging-%{version}...
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: avalon-framework
-BuildRequires: felix-osgi-compendium
-BuildRequires: felix-osgi-core
-BuildRequires: log4j
+BuildRequires: mvn(avalon-framework:avalon-framework-api)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.osgi:org.osgi.compendium)
+BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
-Requires: avalon-framework
-Requires: felix-osgi-compendium
-Requires: felix-osgi-core
-Requires: log4j
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -40,15 +24,13 @@ The OSGi Logging framework implementation. Supports SLF4J,
LOG4J,Jakarta Commons Logging etc.
%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 org.ops4j.pax.logging-logging-%{version}
%pom_remove_parent
%pom_disable_module pax-logging-it
%pom_disable_module pax-logging-samples
@@ -82,41 +64,30 @@ sed -i "s|<_include>-osgi.bnd</_include>|<!--_include>-osgi.bnd</_include-->|" p
%pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin pax-logging-service
%pom_remove_plugin org.apache.maven.plugins:maven-dependency-plugin pax-logging-service
+%mvn_file :%{name}-api %{name}-api
+%mvn_file :%{name}-service %{name}-service
+
%build
# test skip unavailable test deps*
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true install javadoc:aggregate
-
-%install
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}
-for m in %{name}-api \
- %{name}-service; do
- install -m 644 ${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/${m}.jar
- install -pm 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-${m}.pom
-%add_maven_depmap JPP-${m}.pom ${m}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
cp -rp pax-logging-api/NOTICE.txt .
-%files
-%{_javadir}/%{name}-*.jar
-%{_mavenpomdir}/JPP-%{name}*.pom
-%{_mavendepmapfragdir}/%{name}
+%install
+%mvn_install
+
+%files -f .mfiles
%doc CONTRIBUTORS.txt LICENSE.txt NOTICE.txt RELEASE-NOTES.html
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jul 03 2013 gil cattaneo <puntogil(a)libero.it> 1.6.9-6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 0b4eb90..a641748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ead388ed5b8cdad5e8125ad729a237b6 pax-logging-1.6.9-src-git.tar.xz
+c7e55dd5cfb75fbe3fe47317848acd15 logging-1.6.9.tar.gz
10 years, 11 months
[parboiled] switch to XMvn
by gil
commit 37fbd997e7e14ecc370d6905159273f74f4b0ea4
Author: gil <puntogil(a)libero.it>
Date: Wed Jul 3 23:31:17 2013 +0200
switch to XMvn
.gitignore | 1 +
parboiled.spec | 78 +++++++++++++++++++++-----------------------------------
sources | 2 +-
3 files changed, 31 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b12004..d9ccb36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/parboiled-1.0.2-src-git.tar.xz
+/1.0.2.tar.gz
diff --git a/parboiled.spec b/parboiled.spec
index 591d65d..e1e61ed 100644
--- a/parboiled.spec
+++ b/parboiled.spec
@@ -1,13 +1,10 @@
Name: parboiled
Version: 1.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java/Scala library providing parsing of input text based on PEGs
-Group: Development/Libraries
License: ASL 2.0
URL: http://parboiled.org/
-# git clone git://github.com/sirthias/parboiled.git parboiled-1.0.2
-# cd parboiled-1.0.2/ && git archive --format=tar --prefix=parboiled-1.0.2/ 1.0.2 | xz > ../parboiled-1.0.2-src-git.tar.xz
-Source0: %{name}-%{version}-src-git.tar.xz
+Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz
# for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled
Source1: http://repo1.maven.org/maven2/org/%{name}/%{name}-core/%{version}/%{name}...
Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-java/%{version}/%{name}...
@@ -15,32 +12,27 @@ Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-java/%{version}
Source3: %{name}-%{version}-pom.xml
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: objectweb-asm
-
-# TODO parboiled-scala require org.scala-lang scala-library 2.9.1
-# use https://github.com/davidB/scala-maven-plugin v3.0.2
-# BuildRequires: scala
-# BuildRequires: scala-maven-plugin
+BuildRequires: mvn(asm:asm)
+BuildRequires: mvn(asm:asm-analysis)
+BuildRequires: mvn(asm:asm-tree)
+BuildRequires: mvn(asm:asm-util)
+%if 0
+# TODO
+BuildRequires: mvn(org.scala-lang:scala-library)
# test deps
-#BuildRequires: mvn(org.scalatest:scalatest_2.10.0-RC1)
-#BuildRequires: testng
+BuildRequires: mvn(org.scalatest:scalatest_2.10)
+BuildRequires: mvn(org.testng:testng)
+
+# use https://github.com/davidB/scala-maven-plugin
+BuildRequires: scala-maven-plugin
+BuildRequires: maven-surefire-provider-testng
+%endif
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: objectweb-asm
-
-Requires: java
-Requires: jpackage-utils
+
+
BuildArch: noarch
%description
@@ -52,9 +44,7 @@ make a good replacement for regular expressions and generally have quite
a few advantages over the "traditional" way of building parsers via CFGs.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -70,39 +60,29 @@ cp -p %{SOURCE2} %{name}-java/pom.xml
#cp -p %%{SOURCE?} %%{name}-scala/pom.xml
cp -p %{SOURCE3} pom.xml
+%mvn_file :%{name}-core %{name}/core
+%mvn_file :%{name}-java %{name}/java
+
%build
# test skipped unavailable dep org.scalatest scalatest_2.9.0 1.6.1
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_mavenpomdir}
-mkdir -p %{buildroot}%{_javadir}/%{name}
-# scala
-for m in \
- core \
- java;do
- install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.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
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
%doc CHANGELOG LICENSE README.markdown
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
%changelog
+* Wed Jul 03 2013 gil cattaneo <puntogil(a)libero.it> 1.0.2-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.0.2-4
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
diff --git a/sources b/sources
index 2896984..b1b4071 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-deed9de4d69d2fa7944a5f7f31f4ba8c parboiled-1.0.2-src-git.tar.xz
+f6f250aa70e4a891eb96f549eb08db6d 1.0.2.tar.gz
10 years, 11 months