[apache-commons-csv] Build with xmvn
by Michal Srb
commit ff5bdf3e703786afa961b97253f0137c95b6bf82
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Jan 15 14:21:07 2013 +0100
Build with xmvn
- Spec file cleanup
apache-commons-csv.spec | 50 +++++++++++-----------------------------------
1 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec
index 8797768..d5d7da0 100644
--- a/apache-commons-csv.spec
+++ b/apache-commons-csv.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.0
-Release: 0.3.svn1071189%{?dist}
+Release: 0.4.svn1071189%{?dist}
Summary: Utilities to assist with handling of CSV files
License: ASL 2.0
Group: Development/Libraries
@@ -13,17 +13,13 @@ URL: http://commons.apache.org/sandbox/%{base_name}
Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
+BuildRequires: xmvn >= 0.2.1
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: junit4
-BuildRequires: maven
BuildRequires: maven-surefire-provider-junit4
BuildRequires: apache-commons-parent
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
Commons CSV was started to unify a common and simple interface for
@@ -44,46 +40,24 @@ sed -i 's/\r//' *.txt
sed -i 's:commons-sandbox-parent:commons-parent:' pom.xml
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_file : %{short_name} %{name}
+%mvn_alias : %{short_name}:%{short_name}
+%mvn_build
%install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
-%files javadoc
-%defattr(-,root,root,-)
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 15 2013 Michal Srb <msrb(a)redhat.com> - 1.0-0.4.svn1071189
+- Build with xmvn
+- Spec file cleanup
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.3.svn1071189
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 4 months
[apache-commons-configuration] Build with xmvn
by Michal Srb
commit be53d277a49047487ef11e3bc4253e2723cd63c0
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Jan 15 12:55:19 2013 +0100
Build with xmvn
apache-commons-configuration.spec | 45 +++++++++----------------------------
1 files changed, 11 insertions(+), 34 deletions(-)
---
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index a121b2a..1fe3dab 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
@@ -13,9 +13,9 @@ URL: http://commons.apache.org/%{base_name}/
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
BuildArch: noarch
+BuildRequires: xmvn >= 0.2.1
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
@@ -42,19 +42,6 @@ BuildRequires: apache-commons-vfs
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: xml-commons-resolver
-Requires: java
-Requires: jpackage-utils
-Requires: apache-commons-beanutils
-Requires: apache-commons-codec
-Requires: apache-commons-collections
-Requires: apache-commons-digester
-Requires: apache-commons-jexl
-Requires: apache-commons-jxpath
-Requires: apache-commons-lang
-Requires: apache-commons-logging
-Requires: apache-commons-vfs
-Requires: tomcat-servlet-3.0-api
-Requires: xml-commons-resolver
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
@@ -90,35 +77,25 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%{__sed} -i 's/\r//' LICENSE.txt NOTICE.txt
%build
+%mvn_file : %{short_name} %{name}
+%mvn_alias : org.apache.commons:%{short_name}
# We skip tests because we don't have test deps (dbunit in particular).
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f
%install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-install -p -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a org.apache.commons:%{short_name}
-
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
-
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 15 2013 Michal Srb <msrb(a)redhat.com> - 1.9-2
+- Build with xmvn
+
* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9-1
- Update to upstream version 1.9
- Update to currennt packaging guidelines
11 years, 4 months
[maven-remote-resources-plugin] Update to upstream version 1.4
by Mikolaj Izdebski
commit 3592ac012b5b91edef9edb4ce862bab89614da32
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 15 15:49:49 2013 +0100
Update to upstream version 1.4
.gitignore | 1 +
maven-remote-resources-plugin-mojo.patch | 22 --------------------
maven-remote-resources-plugin.spec | 33 +++++++++++++++++++----------
sources | 2 +-
4 files changed, 23 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 428ccdc..aa3d291 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-remote-resources-plugin-1.1.tar.bz2
maven-remote-resources-plugin-1.2-source-release.zip
maven-remote-resources-plugin-1.2.1-source-release.zip
/maven-remote-resources-plugin-1.3-source-release.zip
+/maven-remote-resources-plugin-1.4-source-release.zip
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 5da5e33..c617393 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,16 +1,12 @@
Name: maven-remote-resources-plugin
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Maven Remote Resources Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
-#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
-#the version 1.3 of maven-shared-common-artifact-filters package.
-Patch0: %{name}-mojo.patch
BuildArch: noarch
@@ -40,13 +36,20 @@ BuildRequires: maven-shared-verifier
BuildRequires: maven-surefire-provider-junit
BuildRequires: modello
-Requires: maven
Requires: java
-Requires: jpackage-utils
-Requires: maven-wagon
-Requires: maven-shared-artifact-resolver
-Requires: maven-shared-downloader
+Requires: maven
+Requires: maven-artifact-resolver
+Requires: maven-common-artifact-filters
+Requires: maven-filtering
+Requires: maven-monitor
+Requires: maven-plugin-annotations
+Requires: maven-project
+Requires: plexus-containers-container-default
+Requires: plexus-interpolation
Requires: plexus-resources
+Requires: plexus-utils
+Requires: plexus-velocity
+Requires: velocity
Obsoletes: maven2-plugin-remote-resources <= 0:2.0.8
Provides: maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -71,7 +74,10 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
+#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
+#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
+#the version 1.3 of maven-shared-common-artifact-filters package.
+sed -i "s/TransitivityFilter/Project&/" `find -name ProcessRemoteResourcesMojo.java`
%build
# fix 613582
@@ -104,6 +110,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Jan 15 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index e0116fe..39ca71b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14113a010145be97d4258adb27ef6a7a maven-remote-resources-plugin-1.3-source-release.zip
+41931941e90d94e6698346a95f6c76c3 maven-remote-resources-plugin-1.4-source-release.zip
11 years, 4 months
[apache-commons-math/f18] Update to 3.1.1
by Mohamed ElMorabity
commit fb23e2915546965729f1fddd0c8c6df62b61dd28
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Jan 15 15:22:02 2013 +0100
Update to 3.1.1
.gitignore | 1 +
apache-commons-math.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7331864..b20e0b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ commons-math-2.0-src.tar.gz
/commons-math-2.2-src.tar.gz
/commons-math3-3.0-src.tar.gz
/commons-math3-3.1-src.tar.gz
+/commons-math3-3.1.1-src.tar.gz
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index 9f6e094..a340c59 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}3
Name: apache-commons-math
-Version: 3.1
+Version: 3.1.1
Release: 1%{?dist}
Summary: Java library of lightweight mathematics and statistics components
@@ -67,6 +67,9 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%changelog
+* Tue Jan 15 2013 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1
+
* Sun Dec 30 2012 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 3.1-1
- Update to 3.1
diff --git a/sources b/sources
index c05b42b..6a1a1f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89600ffbe0b9882fc96fb59e99fff887 commons-math3-3.1-src.tar.gz
+8d1b5934304262797c56d19a5c3305ad commons-math3-3.1.1-src.tar.gz
11 years, 4 months
[apache-commons-math] Update to 3.1.1
by Mohamed ElMorabity
commit a328922919a557972ba4ec5a462051c8810f27e2
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Jan 15 15:22:02 2013 +0100
Update to 3.1.1
.gitignore | 1 +
apache-commons-math.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7331864..b20e0b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ commons-math-2.0-src.tar.gz
/commons-math-2.2-src.tar.gz
/commons-math3-3.0-src.tar.gz
/commons-math3-3.1-src.tar.gz
+/commons-math3-3.1.1-src.tar.gz
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index 9f6e094..a340c59 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}3
Name: apache-commons-math
-Version: 3.1
+Version: 3.1.1
Release: 1%{?dist}
Summary: Java library of lightweight mathematics and statistics components
@@ -67,6 +67,9 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%changelog
+* Tue Jan 15 2013 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1
+
* Sun Dec 30 2012 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 3.1-1
- Update to 3.1
diff --git a/sources b/sources
index c05b42b..6a1a1f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89600ffbe0b9882fc96fb59e99fff887 commons-math3-3.1-src.tar.gz
+8d1b5934304262797c56d19a5c3305ad commons-math3-3.1.1-src.tar.gz
11 years, 4 months