[ant] Run tests in %check instead of %build
by Mikolaj Izdebski
commit 86f0e31076cc22a97164416717d0a5838f9bdf38
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 07:19:39 2013 +0200
Run tests in %check instead of %build
ant.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 4049de2..c2ef6b6 100644
--- a/ant.spec
+++ b/ant.spec
@@ -29,6 +29,7 @@
#
%bcond_with bootstrap
+%bcond_without tests
%if %with bootstrap
%global build_javadoc 0
@@ -389,7 +390,7 @@ mv LICENSE.utf8 LICENSE
%build
%if %without bootstrap
-%{ant} jars test-jar test
+%{ant} jars test-jar
%if %{build_javadoc}
export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs
@@ -511,6 +512,11 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
| xargs -t rm
%endif
+%if %with tests
+%check
+%{ant} test
+%endif
+
%files
%doc KEYS LICENSE NOTICE README WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.conf
@@ -682,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Remove bcond macro definitions (provided by rpm itself)
- Remove Group tags
- Update to current packaging guidelines
+- Run tests in %%check instead of %%build
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Update to current packaging guidelines
by Mikolaj Izdebski
commit 2f0d532518e94f1ba255429ee30431f31d3beed0
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 06:45:12 2013 +0200
Update to current packaging guidelines
ant.spec | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index d88ee0c..4049de2 100644
--- a/ant.spec
+++ b/ant.spec
@@ -347,7 +347,6 @@ Documentation pour %{name}.
%package javadoc
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -418,29 +417,26 @@ do
jarname=$(basename $jar .jar)
pomname="JPP.%{name}-${jarname}.pom"
- #Determine where to put it
- case $jarname in
-#These go into %%{_javadir}, pom files have different names
- ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";pomname="JPP-$jarname.pom";;
-#Bootstracp builds an incomplete ant-junit, don't ship it
%if %with bootstrap
- ant-junit) continue;;
+ #Bootstracp builds an incomplete ant-junit, don't ship it
+ [ $jarname == ant-bootstrap ] && continue
%endif
-#These go into %%{_javadir}/ant
- *) destdir=$RPM_BUILD_ROOT%{_javadir}/%{name}; destname="/%{name}";
- esac
#instal jar
- install -m 644 ${jar} ${destdir}/${jarname}.jar
+ install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
# jar aliases
- ln -sf ../../java${destname}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar
+ ln -sf ../../java/%{name}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar
#bootstrap does not have a pom
[ $jarname == ant-bootstrap ] && continue
#install pom
- install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname}
- %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname}
+ install -p -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname}
+ %add_maven_depmap ${pomname} %{name}/${jarname}.jar
+done
+
+for mod in ant ant-bootstrap ant-launcher; do
+ ln -sf %{name}/${mod}.jar $RPM_BUILD_ROOT%{_javadir}
done
# add backward compatibility for nodeps jar that is now part of
@@ -448,8 +444,8 @@ done
%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant
#ant-parent pom
-install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent
+install -p -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
+%add_maven_depmap JPP-%{name}-parent.pom
# scripts: remove dos and os/2 scripts
rm -f src/script/*.bat
@@ -524,6 +520,9 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/%{name}-launcher.jar
%{_javadir}/%{name}-bootstrap.jar
%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
+%{_javadir}/%{name}/%{name}-launcher.jar
+%{_javadir}/%{name}/%{name}-bootstrap.jar
%dir %{ant_home}
%dir %{ant_home}/etc
%{ant_home}/etc/ant-update.xsl
@@ -682,6 +681,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Remove arch-specific patch as ant is noarch now
- Remove bcond macro definitions (provided by rpm itself)
- Remove Group tags
+- Update to current packaging guidelines
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Remove Group tags
by Mikolaj Izdebski
commit 4f6293f6b5b1dfac76d154e82769e14b23e58da9
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 06:25:31 2013 +0200
Remove Group tags
ant.spec | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 9e6a4b5..d88ee0c 100644
--- a/ant.spec
+++ b/ant.spec
@@ -51,7 +51,6 @@ Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
License: ASL 2.0 and W3C
URL: http://ant.apache.org/
-Group: Development/Tools
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
Source2: apache-ant-%{major_version}.ant.conf
@@ -93,7 +92,6 @@ apache xml.
%package jmf
Summary: Optional jmf tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
%description jmf
@@ -104,7 +102,6 @@ Taches jmf optionelles pour %{name}.
%package swing
Summary: Optional swing tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
%description swing
@@ -117,7 +114,6 @@ Taches swing optionelles pour %{name}.
%if %{with_manifest_only}
%package manifest-only
Summary: Manifest-only jars for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: %{name}-icontract = %{epoch}:%{version}-%{release}
Provides: %{name}-netrexx = %{epoch}:%{version}-%{release}
@@ -134,7 +130,6 @@ Manifest-only jars for %{name}.
%package antlr
Summary: Optional antlr tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: antlr
BuildRequires: antlr
@@ -147,7 +142,6 @@ Taches antlr optionelles pour %{name}.
%package apache-bsf
Summary: Optional apache bsf tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bsf
BuildRequires: bsf
@@ -160,7 +154,6 @@ Taches apache bsf optionelles pour %{name}.
%package apache-resolver
Summary: Optional apache resolver tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: xml-commons-resolver
BuildRequires: xml-commons-resolver
@@ -173,7 +166,6 @@ Taches apache resolver optionelles pour %{name}.
%package commons-logging
Summary: Optional commons logging tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: apache-commons-logging
BuildRequires: apache-commons-logging
@@ -186,7 +178,6 @@ Taches commons logging optionelles pour %{name}.
%package commons-net
Summary: Optional commons net tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: apache-commons-net
BuildRequires: apache-commons-net
@@ -201,7 +192,6 @@ Taches commons net optionelles pour %{name}.
%if 0
%package jai
Summary: Optional jai tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jai
BuildRequires: jai
@@ -215,7 +205,6 @@ Taches jai optionelles pour %{name}.
%package apache-bcel
Summary: Optional apache bcel tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bcel
BuildRequires: bcel
@@ -228,7 +217,6 @@ Taches apache bcel optionelles pour %{name}.
%package apache-log4j
Summary: Optional apache log4j tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: log4j
BuildRequires: log4j
@@ -241,7 +229,6 @@ Taches apache log4j optionelles pour %{name}.
%package apache-oro
Summary: Optional apache oro tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jakarta-oro
BuildRequires: jakarta-oro
@@ -254,7 +241,6 @@ Taches apache oro optionelles pour %{name}.
%package apache-regexp
Summary: Optional apache regexp tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: regexp
BuildRequires: regexp
@@ -267,7 +253,6 @@ Taches apache regexp optionelles pour %{name}.
%package apache-xalan2
Summary: Optional apache xalan2 tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: regexp
BuildRequires: regexp
@@ -281,7 +266,6 @@ Taches apache xalan2 optionelles pour %{name}.
%package javamail
Summary: Optional javamail tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: javamail >= 0:1.2-5jpp
BuildRequires: javamail >= 0:1.2-5jpp
@@ -294,7 +278,6 @@ Taches javamail optionelles pour %{name}.
%package jdepend
Summary: Optional jdepend tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jdepend
BuildRequires: jdepend
@@ -307,7 +290,6 @@ Taches jdepend optionelles pour %{name}.
%package jsch
Summary: Optional jsch tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jsch
BuildRequires: jsch
@@ -320,7 +302,6 @@ Taches jsch optionelles pour %{name}.
%package junit
Summary: Optional junit tasks for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: junit
Requires: xalan-j2
@@ -333,7 +314,6 @@ Taches junit optionelles pour %{name}.
%package testutil
Summary: Test utility classes for %{name}
-Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: junit
@@ -342,7 +322,6 @@ Test utility tasks for %{name}.
%package scripts
Summary: Additional scripts for %{name}
-Group: Development/Tools
AutoReqProv: no
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{_bindir}/perl
@@ -356,7 +335,6 @@ Scripts additionels pour %{name}.
%package manual
Summary: Manual for %{name}
-Group: Development/Tools
%description manual
Documentation for %{name}.
@@ -369,7 +347,6 @@ Documentation pour %{name}.
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
Requires: jpackage-utils
%description javadoc
@@ -704,6 +681,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
* Tue Jul 2 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.9.1-3
- Remove arch-specific patch as ant is noarch now
- Remove bcond macro definitions (provided by rpm itself)
+- Remove Group tags
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Remove bcond macro definitions (provided by rpm itself)
by Mikolaj Izdebski
commit 1888b36bf195beb74045f6aa0d1372d368a7b934
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 06:23:17 2013 +0200
Remove bcond macro definitions (provided by rpm itself)
ant.spec | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 7bfe47d..9e6a4b5 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,11 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-
%bcond_with bootstrap
%if %with bootstrap
@@ -708,6 +703,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%changelog
* Tue Jul 2 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.9.1-3
- Remove arch-specific patch as ant is noarch now
+- Remove bcond macro definitions (provided by rpm itself)
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Remove arch-specific patch as ant is noarch now
by Mikolaj Izdebski
commit 96151060abf0362bee265ff223a6da8f43db400d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 06:20:32 2013 +0200
Remove arch-specific patch as ant is noarch now
ant.spec | 10 ++---
apache-ant-bz163689.patch | 100 ---------------------------------------------
2 files changed, 4 insertions(+), 106 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 095f7a3..7bfe47d 100644
--- a/ant.spec
+++ b/ant.spec
@@ -49,7 +49,7 @@
Name: ant
Version: 1.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -61,7 +61,6 @@ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source2: apache-ant-%{major_version}.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
-Patch1: apache-ant-bz163689.patch
Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch
@@ -391,10 +390,6 @@ Javadoc pour %{name}.
%setup -q -n apache-ant-%{version}
#Fixup version
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
-# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-%ifarch ppc64 s390x
-%patch1 -p1
-%endif
# When bootstrapping, we don't have junit
%patch3
@@ -711,6 +706,9 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# -----------------------------------------------------------------------------
%changelog
+* Tue Jul 2 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.9.1-3
+- Remove arch-specific patch as ant is noarch now
+
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[javapackages-tools] Add R: jvnet-parent
by Mikolaj Izdebski
commit 268477b3649a2d813f99e5ac5215524cbcb39d6e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jul 1 18:33:38 2013 +0200
Add R: jvnet-parent
javapackages-tools.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 4d955a5..762a6fd 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 0.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
@@ -30,6 +30,7 @@ Requires: apache-parent
Requires: geronimo-parent-poms
Requires: httpcomponents-project
Requires: jboss-parent
+Requires: jvnet-parent
Requires: maven-parent
Requires: maven-plugins-pom
Requires: mojo-parent
@@ -122,6 +123,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Mon Jul 1 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.15.0-2
+- Add R: jvnet-parent
+
* Wed Jun 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.15.0-1
- Update to upstream version 0.15.0
- Added depmap for tools.jar
10 years, 9 months
[apache-commons-jexl] Install NOTICE file with javadoc package
by Mikolaj Izdebski
commit ca98029cac10daf2ef995df41ebd918c75b06f67
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jul 1 18:19:46 2013 +0200
Install NOTICE file with javadoc package
apache-commons-jexl.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 13828fe..50c7019 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -2,7 +2,7 @@
Name: apache-%{jarname}
Version: 2.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Java Expression Language (JEXL)
Group: Development/Libraries
@@ -66,11 +66,14 @@ find -name '*.txt' -exec sed -i 's/\r//' '{}' +
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Mon Jul 1 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.1-7
+- Install NOTICE file with javadoc package
+
* 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
10 years, 9 months
[portlet-2.0-api] switch to XMvn, minor changes to adapt to current guideline
by gil
commit a03c95ae8cfa9d4490c5768b0b6407f61e557dd9
Author: gil <puntogil(a)libero.it>
Date: Mon Jul 1 18:02:08 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
portlet-2.0-api.spec | 62 ++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 42 deletions(-)
---
diff --git a/portlet-2.0-api.spec b/portlet-2.0-api.spec
index d6573db..2c964e4 100644
--- a/portlet-2.0-api.spec
+++ b/portlet-2.0-api.spec
@@ -2,36 +2,20 @@
%global pkg_name portlet-api_%{api_version}_spec
Name: portlet-2.0-api
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Portlet Specification V2.0
-Group: Development/Libraries
License: ASL 2.0
Url: http://portals.apache.org/
# svn export http://svn.apache.org/repos/asf/portals/portlet-spec/tags/portlet-api_2.0... portlet-2.0-api-1.0
# tar czf portlet-2.0-api-1.0-src-svn.tar.gz portlet-2.0-api-1.0
-Source0: portlet-2.0-api-1.0-src-svn.tar.gz
-# force servlet-3.0-api use
-Source1: portlet-2.0-api-1.0-depmap
+Source0: %{name}-%{version}-src-svn.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: portals-pom
-
-BuildRequires: tomcat-servlet-3.0-api
-
+BuildRequires: mvn(org.apache.portals:portals-pom)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
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-surefire-plugin
-
-Requires: portals-pom
-Requires: tomcat-servlet-3.0-api
-
-Requires: java
-Requires: jpackage-utils
+Requires: mvn(org.apache.portals:portals-pom)
BuildArch: noarch
%description
@@ -39,9 +23,7 @@ The Java Portlet API version 2.0 developed by the
Java Community Process JSR-286 Expert Group.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -60,33 +42,30 @@ done
# change apis version
sed -i "s|javax.servlet.http;version=2.4,*|javax.servlet.http;version=3.0,*|" pom.xml
-%build
+# Force tomcat apis
+%pom_remove_dep javax.servlet:servlet-api
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.local.depmap.file="%{SOURCE1}" install javadoc:aggregate
+%mvn_file :%{pkg_name} %{name}
+%mvn_alias :%{pkg_name} javax.portlet:portlet-api
-%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{pkg_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%build
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.portlet:portlet-api"
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
-%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
+* Mon Jul 01 2013 gil cattaneo <puntogil(a)libero.it> 1.0-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.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -101,5 +80,4 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
- Install NOTICE file along with javadoc package
* Sat May 19 2012 gil cattaneo <puntogil(a)libero.it> 1.0-1
-- initial rpm
-
+- initial rpm
\ No newline at end of file
10 years, 9 months
[tiger-types] switch to XMvn, minor changes to adapt to current guideline
by gil
commit d5597a131336e1ac35e5e186606a85c2397c9c7e
Author: gil <puntogil(a)libero.it>
Date: Mon Jul 1 17:32:22 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
tiger-types.spec | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/tiger-types.spec b/tiger-types.spec
index 26a416b..1350804 100644
--- a/tiger-types.spec
+++ b/tiger-types.spec
@@ -1,8 +1,7 @@
Name: tiger-types
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Type arithmetic library for Java5
-Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
Url: http://java.net/projects/tiger-types
# svn export https://svn.java.net/svn/tiger-types~svn/tags/tiger-types-1.4
@@ -13,31 +12,22 @@ Source0: %{name}-%{version}-src-svn.tar.gz
Source1: glassfish-LICENSE.txt
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: jvnet-parent
BuildRequires: junit
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: jvnet-parent
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
Tiger-types is a type arithmetic library for Java5.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -64,42 +54,38 @@ This package contains javadoc for %{name}.
</execution>
</executions>'
# removed some warning
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-compiler-plugin']" "<groupId>org.apache.maven.plugins</groupId><version>2.5.1</version>"
-%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" "<groupId>org.apache.maven.plugins</groupId><version>2.9</version>"
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-compiler-plugin']" "
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>any</version>"
+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" "
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>any</version>"
# Unneeded
%pom_remove_plugin :maven-idea-plugin
%pom_remove_plugin :maven-release-plugin
+%mvn_file :%{name} %{name}
+
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
%build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
%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
+* Mon Jul 01 2013 gil cattaneo <puntogil(a)libero.it> 1.4-2
+- switch to XMvn, minor changes to adapt to current guideline
+
* Sat Aug 25 2012 gil cattaneo <puntogil(a)libero.it> 1.4-1
- initial rpm
\ No newline at end of file
10 years, 9 months