[xmlstreambuffer] switch to XMvn, minor changes to adapt to current guideline
by gil
commit ba581686bc354cce9d0edf2fad2ee9f538dc40a3
Author: gil <puntogil(a)libero.it>
Date: Sat Jun 29 16:40:50 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
xmlstreambuffer.spec | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec
index 6822b36..648e68e 100644
--- a/xmlstreambuffer.spec
+++ b/xmlstreambuffer.spec
@@ -1,8 +1,7 @@
Name: xmlstreambuffer
Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: XML Stream Buffer
-Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
Url: http://java.net/projects/xmlstreambuffer/
# svn export https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.1/ xmlstreambuffer-1.5.1
@@ -19,13 +18,7 @@ BuildRequires: java-devel
BuildRequires: jvnet-parent
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-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
BuildRequires: bea-stax-api
@@ -35,10 +28,6 @@ BuildRequires: stax-ex >= 1.7.1
BuildRequires: junit
BuildRequires: woodstox-core
-Requires: bea-stax-api
-Requires: stax-ex >= 1.7.1
-
-Requires: java
BuildArch: noarch
%description
@@ -63,7 +52,6 @@ Stream buffers may be used as an efficient alternative to DOM where:
SAX or StAX.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -78,33 +66,25 @@ sed -i "s|<artifactId>wstx-asl</artifactId>|<artifactId>woodstox-core-asl</artif
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
+%mvn_file :streambuffer %{name}
+
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/streambuffer-%{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 -pr 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 -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil(a)libero.it> 1.5.1-2
+- switch to XMvn, minor changes to adapt to current guideline
+
* Tue Oct 30 2012 gil cattaneo <puntogil(a)libero.it> 1.5.1-1
- update to 1.5.1
10 years, 10 months
[apache-commons-jci] switch to XMvn, minor changes to adapt to current guideline
by gil
commit 6eb172af3be8158f0dbe611e27049cf9705e7c71
Author: gil <puntogil(a)libero.it>
Date: Sat Jun 29 15:53:29 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
apache-commons-jci.spec | 113 ++++++++++-------------------------------------
1 files changed, 24 insertions(+), 89 deletions(-)
---
diff --git a/apache-commons-jci.spec b/apache-commons-jci.spec
index 3da5181..4869b05 100644
--- a/apache-commons-jci.spec
+++ b/apache-commons-jci.spec
@@ -5,9 +5,8 @@
Name: apache-commons-jci
Version: 1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Commons Java Compiler Interface
-Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/jci/
Source0: ftp://ftp.gbnet.net/pub/apache/dist/commons/%{base_name}/source/%{short_n...
@@ -31,19 +30,12 @@ Patch4: %{name}-%{namedversion}-janino26.patch
Patch5: %{name}-%{namedversion}-ecj4.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: maven-local
BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
BuildRequires: apache-commons-logging
@@ -59,9 +51,6 @@ BuildRequires: junit
BuildRequires: objectweb-asm
Requires: %{name}-core = %{version}-%{release}
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
#* javac Commons JCI compiler implementation for the javac compiler (up to JDK 1.5).
@@ -78,19 +67,13 @@ compilers:
* rhino
%package core
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - core
-Requires: apache-commons-io
-Requires: %{name}-fam = %{version}-%{release}
%description core
Commons JCI core interfaces and implementations.
%package fam
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - FAM
-Requires: apache-commons-logging
-Requires: %{name} = %{version}-%{release}
%description fam
Commons JCI FileAlterationMonitor (FAM) to
@@ -98,9 +81,7 @@ monitor local file systems and get notified
about changes.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -108,37 +89,25 @@ This package contains javadoc for %{name}.
# compilers
%package eclipse
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - eclipse
-Requires: ecj >= 3.4.2-13
-Requires: %{name} = %{version}-%{release}
%description eclipse
Commons JCI compiler implementation for the eclipse compiler.
%package groovy
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - groovy
-Requires: groovy
-Requires: %{name}-core = %{version}-%{release}
%description groovy
Commons JCI compiler implementation for the groovy compiler.
%package janino
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - janino
-Requires: janino
-Requires: %{name}-core = %{version}-%{release}
%description janino
Commons JCI compiler implementation for the janino compiler.
%package rhino
-Group: Development/Libraries
Summary: Commons Java Compiler Interface - rhino
-Requires: rhino
-Requires: %{name}-core = %{version}-%{release}
%description rhino
Commons JCI compiler implementation for rhino JavaScript.
@@ -162,82 +131,48 @@ find . -name "*.jar" -delete
sed -i "s|<maven.compile.source>1.4<|<maven.compile.source>1.5<|" pom.xml
sed -i "s|<maven.compile.target>1.4<|<maven.compile.target>1.5<|" pom.xml
+# Fix installation directory
+
+%mvn_file :%{short_name}-core %{short_name}/%{short_name}-core
+%mvn_file :%{short_name}-fam %{short_name}/%{short_name}-fam
+%mvn_file :%{short_name}-eclipse %{short_name}/%{short_name}-eclipse
+%mvn_file :%{short_name}-groovy %{short_name}/%{short_name}-groovy
+%mvn_file :%{short_name}-janino %{short_name}/%{short_name}-janino
+%mvn_file :%{short_name}-rhino %{short_name}/%{short_name}-rhino
+
%build
# random tests failures
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- -Dmaven.local.depmap.file="%{SOURCE1}" \
- package javadoc:aggregate
+%mvn_build -s -- -Dmaven.test.failure.ignore=true -Dmaven.local.depmap.file="%{SOURCE1}"
%install
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-parent.pom
-%add_maven_depmap JPP.%{short_name}-parent.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{short_name}
-for m in core \
- fam;do
- install -m 644 ${m}/target/%{short_name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{short_name}/%{short_name}-${m}.jar
- install -pm 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-${m}.pom
- %add_maven_depmap -f ${m} JPP.%{short_name}-%{short_name}-${m}.pom %{short_name}/%{short_name}-${m}.jar
-done
-
-# javac
-for mc in eclipse \
- janino \
- groovy \
- rhino;do
- install -m 644 compilers/${mc}/target/%{short_name}-${mc}-%{namedversion}.jar %{buildroot}%{_javadir}/%{short_name}/%{short_name}-${mc}.jar
- install -pm 644 compilers/${mc}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-${mc}.pom
- %add_maven_depmap -f ${mc} JPP.%{short_name}-%{short_name}-${mc}.pom %{short_name}/%{short_name}-${mc}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
%files
%dir %{_javadir}/%{short_name}
-%{_mavenpomdir}/JPP.%{short_name}-parent.pom
-%{_mavendepmapfragdir}/%{name}
+%{_mavendepmapfragdir}/apache-commons-jci-commons-jci.xml
+%{_mavenpomdir}/JPP.apache-commons-jci-org.apache.commons(a)commons-jci.pom
%doc LICENSE.txt NOTICE.txt README.txt TODO.txt
-%files core
-%{_javadir}/%{short_name}/%{short_name}-core.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-core.pom
-%{_mavendepmapfragdir}/%{name}-core
+%files core -f .mfiles-%{short_name}-core
-%files fam
-%{_javadir}/%{short_name}/%{short_name}-fam.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-fam.pom
-%{_mavendepmapfragdir}/%{name}-fam
+%files fam -f .mfiles-%{short_name}-fam
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%files eclipse
-%{_javadir}/%{short_name}/%{short_name}-eclipse.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-eclipse.pom
-%{_mavendepmapfragdir}/%{name}-eclipse
+%files eclipse -f .mfiles-%{short_name}-eclipse
-%files groovy
-%{_javadir}/%{short_name}/%{short_name}-groovy.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-groovy.pom
-%{_mavendepmapfragdir}/%{name}-groovy
+%files groovy -f .mfiles-%{short_name}-groovy
-%files janino
-%{_javadir}/%{short_name}/%{short_name}-janino.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-janino.pom
-%{_mavendepmapfragdir}/%{name}-janino
+%files janino -f .mfiles-%{short_name}-janino
-%files rhino
-%{_javadir}/%{short_name}/%{short_name}-rhino.jar
-%{_mavenpomdir}/JPP.%{short_name}-%{short_name}-rhino.pom
-%{_mavendepmapfragdir}/%{name}-rhino
+%files rhino -f .mfiles-%{short_name}-rhino
%changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil(a)libero.it> 1.0-9
+- switch to XMvn, minor changes to adapt to current guideline
+
* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> - 1.0-8
- Make main package own jar directory
10 years, 10 months
[bookkeeper] switch to XMvn, minor changes to adapt to current guideline
by gil
commit 06d2ebf3cedf78f9fd12d82638de16fe5c94d45a
Author: gil <puntogil(a)libero.it>
Date: Sat Jun 29 13:11:57 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
bookkeeper.spec | 55 ++++++++-----------------------------------------------
1 files changed, 8 insertions(+), 47 deletions(-)
---
diff --git a/bookkeeper.spec b/bookkeeper.spec
index 5004d87..6266ba5 100644
--- a/bookkeeper.spec
+++ b/bookkeeper.spec
@@ -1,7 +1,7 @@
%global _hardened_build 1
Name: bookkeeper
Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache BookKeeper sub-project of ZooKeeper
Group: Development/Libraries
License: ASL 2.0
@@ -65,7 +65,6 @@ BuildRequires: maven-assembly-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
%description
@@ -90,32 +89,13 @@ Requires: libhedwig%{?_isa} = %{version}-%{release}
Development files for the Hedwig C client library.
%package java
-Group: Development/Libraries
Summary: BookKeeper/Hedwig Java libraries
-Requires: apache-commons-cli
-Requires: apache-commons-collections
-Requires: apache-commons-codec
-Requires: apache-commons-configuration
-Requires: apache-commons-io
-Requires: derby
-Requires: guava
-Requires: jline
-Requires: log4j
-#Requires: mvn(org.apache.hadoop:hadoop-common) >= 0.23.1
-#Requires: mvn(org.apache.hadoop:hadoop-hdfs)
-Requires: netty
-Requires: protobuf-java
-Requires: slf4j
-Requires: zookeeper-java
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description java
This package contains BookKeeper/Hedwig Java libraries.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
BuildArch: noarch
@@ -127,9 +107,7 @@ This package contains javadoc for %{name}.
%patch0 -p0
%patch1 -p0
%patch2 -p0
-%if %{?fedora} > 18
%patch3 -p0
-%endif
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bookkeeper-server
@@ -168,7 +146,7 @@ This package contains javadoc for %{name}.
protoc --java_out=src/main/java src/main/protobuf/PubSubProtocol.proto
)
# test skipped for unavailable test deps
-mvn-rpmbuild -Dmaven.test.skip=true -Dmaven.local.depmap.file="%{SOURCE1}" package javadoc:aggregate
+%mvn_build -f -- -Dmaven.local.depmap.file="%{SOURCE1}"
pushd hedwig-client/src/main/cpp
rm -rf autom4te.cache
@@ -191,23 +169,7 @@ popd
find %{buildroot} -name '*.la' -exec rm -f {} ';'
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-# bookkeeper-benchmark
-for m in hedwig-client \
- hedwig-server \
- hedwig-protocol \
- bookkeeper-server; do
- install -m 644 ${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
- install -pm 644 ${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 target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install
%post -n libhedwig -p /sbin/ldconfig
%postun -n libhedwig -p /sbin/ldconfig
@@ -222,18 +184,17 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%{_libdir}/pkgconfig/hedwig-*.pc
%doc LICENSE NOTICE
-%files java
+%files java -f .mfiles
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
%doc CHANGES.txt LICENSE NOTICE README
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil(a)libero.it> 4.2.1-3
+- switch to XMvn, minor changes to adapt to current guideline
+
* Fri Jun 21 2013 gil cattaneo <puntogil(a)libero.it> 4.2.1-2
- fix unowned directories
10 years, 10 months
[apache-commons-jexl] - Update to current maven spec guidelines to fix build (bug 979497) - Add patch to fix test with jun
by Orion Poplawski
commit a4e222e47274dfba28346b3599e91b2624a0ca57
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Jun 28 14:57:21 2013 -0600
- Update to current maven spec guidelines to fix build (bug 979497)
- Add patch to fix test with junit 4.11
001-Fix-tests.patch | 21 +++++++++++++++++
apache-commons-jexl-bsf.patch | 24 -------------------
apache-commons-jexl.spec | 50 +++++++++++++---------------------------
3 files changed, 37 insertions(+), 58 deletions(-)
---
diff --git a/001-Fix-tests.patch b/001-Fix-tests.patch
new file mode 100644
index 0000000..b2859c8
--- /dev/null
+++ b/001-Fix-tests.patch
@@ -0,0 +1,21 @@
+Description: Fix a test failure with JUnit 4.11 due to the out of order
+ execution of the test methods. This issue is fixed in JEXL 3.
+Author: Emmanuel Bourg
+Forwarded: not-needed
+--- a/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
++++ b/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
+@@ -137,6 +137,7 @@
+ * test some simple mathematical calculations
+ */
+ public void testCalculations() throws Exception {
++ JexlThreadedArithmetic.setLenient(Boolean.TRUE);
+
+ asserter.setVariable("foo", new Integer(2));
+
+@@ -347,4 +348,4 @@
+ }
+ debuggerCheck(jexl);
+ }
+-}
+\ No newline at end of file
++}
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 89763a5..13828fe 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -2,31 +2,21 @@
Name: apache-%{jarname}
Version: 2.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Expression Language (JEXL)
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/jexl
Source0: http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{version}-src....
-# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
-Patch0: %{name}-bsf.patch
+# Patch to fix test failure with junit 4.11
+Patch0: 001-Fix-tests.patch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: apache-commons-parent
BuildRequires: maven-local
-BuildRequires: apache-rat-plugin
-BuildRequires: buildnumber-maven-plugin
BuildRequires: javacc-maven-plugin
-BuildRequires: maven-dependency-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-surefire-provider-junit4
BuildArch: noarch
-Requires: jpackage-utils
-Requires: java
Provides: %{jarname} = %{version}-%{release}
%description
@@ -56,43 +46,35 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{jarname}-%{version}-src
-%patch0 -p1 -b .bsf
-find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
+%patch0 -p1 -b .test
+# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
+%pom_remove_dep org.apache.bsf:bsf-api
+find \( -name '*.jar' -o -name '*.class' \) -delete
# Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +
%build
-mvn-rpmbuild install javadoc:aggregate
-
-%install
-
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar
+%mvn_build
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-cp -rp target/site/apidocs \
-$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_mavenpomdir}
-cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a 'commons-jexl:commons-jexl'
+%install
+%mvn_install
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-%{_javadir}/%{jarname}.jar
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Jun 28 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2.1.1-6
+- Update to current maven spec guidelines to fix build (bug 979497)
+- Add patch to fix test with junit 4.11
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 10 months
[apache-commons-vfs] used pom_xpath_set macro
by gil
commit 375d95b2ac222aa7a7ea9dbdcddd9a2be2b9dc26
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 28 17:41:32 2013 +0200
used pom_xpath_set macro
apache-commons-vfs.spec | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index 313f7bc..fdffcbd 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}
Name: apache-commons-vfs
Version: 2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Commons Virtual File System
License: ASL 2.0
Url: http://commons.apache.org/%{base_name}/
@@ -81,13 +81,11 @@ perl -pi -e 's/\r$//g;' *.txt
%pom_xpath_inject "pom:project/pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
<excludePackageNames>*.webdav.*</excludePackageNames>"
# Fix ant gId
-%pom_xpath_remove "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId"
-%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']" "
-<groupId>org.apache.ant</groupId>"
+%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" "
+org.apache.ant"
-%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" core
-%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']" "
-<groupId>org.apache.ant</groupId>" core
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" "
+org.apache.ant" core
# Remove unwanted dependency
%pom_remove_dep :jackrabbit-webdav core
@@ -168,6 +166,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
%config %{_sysconfdir}/ant.d/%{short_name}
%changelog
+* Fri Jun 28 2013 gil cattaneo <puntogil(a)libero.it> 2.0-10
+- used pom_xpath_set macro
+
* Fri Jun 28 2013 gil cattaneo <puntogil(a)libero.it> 2.0-9
- swith to pom macros
- packaged in /usr/share/java instead of /usr/share/java/apache-commons-vfs
10 years, 10 months
[apache-commons-vfs] swith to pom macros, packaged in /usr/share/java
by gil
commit 4abefdea9200ad3e0a9a28554f073581b82a3531
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 28 17:19:10 2013 +0200
swith to pom macros, packaged in /usr/share/java
apache-commons-vfs.spec | 109 +++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 27 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index 4b156a3..313f7bc 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,34 +2,26 @@
%global short_name commons-%{base_name}
Name: apache-commons-vfs
Version: 2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Commons Virtual File System
License: ASL 2.0
Url: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-# add maven-compiler-plugin configuration
-# fix ant gId
-# remove/disable jackrabbit-webdav support
-# remove org.apache.commons commons-build-plugin
-# remove org.codehaus.mojo findbugs-maven-plugin
-# remove maven-scm
-# remove old vfs stuff
-Patch0: %{name}-%{version}-build.patch
-
-BuildRequires: maven-local
-BuildRequires: mvn(com.jcraft:jsch)
-BuildRequires: mvn(commons-collections:commons-collections)
-BuildRequires: mvn(commons-httpclient:commons-httpclient)
-BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(commons-net:commons-net)
-BuildRequires: mvn(org.apache.ant:ant)
-BuildRequires: mvn(org.apache.commons:commons-compress)
-BuildRequires: mvn(org.apache.commons:commons-parent)
-BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires: mvn(org.jdom:jdom)
+
+BuildRequires: maven-local
+BuildRequires: mvn(com.jcraft:jsch)
+BuildRequires: mvn(commons-collections:commons-collections)
+BuildRequires: mvn(commons-httpclient:commons-httpclient)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(commons-net:commons-net)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.commons:commons-compress)
+BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(org.jdom:jdom)
# test deps
-BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(junit:junit)
BuildArch: noarch
Provides: %{name}2 = %{version}-%{release}
@@ -77,15 +69,76 @@ This package contains javadoc for %{name}.
%setup -q -n %{short_name}-%{version}
perl -pi -e 's/\r$//g;' *.txt
-%patch0 -p1
+# Remove unused dependencies
+%pom_remove_dep :maven-scm-api
+%pom_remove_dep :maven-scm-provider-svnexe
+# Remove not available module
+%pom_remove_dep :commons-vfs-sandbox
+# Disable unwanted module
+%pom_disable_module dist
+
+# Fix plugin configuration
+%pom_xpath_inject "pom:project/pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
+<excludePackageNames>*.webdav.*</excludePackageNames>"
+# Fix ant gId
+%pom_xpath_remove "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId"
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']" "
+<groupId>org.apache.ant</groupId>"
+
+%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" core
+%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']" "
+<groupId>org.apache.ant</groupId>" core
+
+# Remove unwanted dependency
+%pom_remove_dep :jackrabbit-webdav core
+
+# Disable jackrabbit-webdav support
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin core "
+<executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <excludes>
+ <exclude>**/webdav/*</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <testExcludes>
+ <exclude>**/webdav/test/*</exclude>
+ </testExcludes>
+ </configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+</executions>"
+
rm -rf core/src/main/java/org/apache/commons/vfs2/provider/webdav
rm -rf core/src/test/java/org/apache/commons/vfs2/provider/webdav
sed -i 's|"webdav",||' core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
-sed -i "s|<module>dist</module>|<!--module>dist</module-->|" pom.xml
-
# not really needed
%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :commons-build-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+
+# Fix installation directory and symlink
+%mvn_file :%{short_name}2 %{name}
+%mvn_file :%{short_name}2 %{name}2
+%mvn_file :%{short_name}2 %{short_name}
+%mvn_file :%{short_name}2 %{short_name}2
+%mvn_file :%{short_name}2-examples %{name}-examples
+%mvn_file :%{short_name}2-examples %{name}2-examples
+%mvn_file :%{short_name}2-examples %{short_name}-examples
+%mvn_file :%{short_name}2-examples %{short_name}2-examples
%mvn_alias :commons-vfs2 "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}"
%mvn_alias :commons-vfs2-examples "org.apache.commons:%{short_name}-examples" "%{short_name}:%{short_name}-examples"
@@ -103,9 +156,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo "ant commons-logging %{short_name}" > %{short_name}
install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
-
%files -f .mfiles-commons-vfs2
-%dir %{_javadir}/%{name}
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%files examples -f .mfiles-commons-vfs2-examples
@@ -117,6 +168,10 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
%config %{_sysconfdir}/ant.d/%{short_name}
%changelog
+* Fri Jun 28 2013 gil cattaneo <puntogil(a)libero.it> 2.0-9
+- swith to pom macros
+- packaged in /usr/share/java instead of /usr/share/java/apache-commons-vfs
+
* Fri Jun 28 2013 Michal Srb <msrb(a)redhat.com> - 2.0-8
- Fix directory ownership
10 years, 10 months