[maven-skins] Adapt to latest guidelines
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Feb 21 16:14:48 UTC 2014
commit f1ddd3c6356f29eee308ea6de42cd8863872201a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Feb 21 18:15:32 2014 +0200
Adapt to latest guidelines
maven-skins.spec | 42 +++++++++---------------------------------
1 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/maven-skins.spec b/maven-skins.spec
index c3f0359..70b4bee 100644
--- a/maven-skins.spec
+++ b/maven-skins.spec
@@ -5,7 +5,7 @@
Name: maven-skins
Version: 5
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Maven Skins
Group: Development/Libraries
@@ -23,8 +23,8 @@ BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-site-plugin
-Requires: jpackage-utils
-Requires: java
+Requires: javapackages-tools
+Requires: java-headless
%description
Skins for the maven site generator.
@@ -39,42 +39,18 @@ sed -i -e "s|5-SNAPSHOT|5|g" maven-stylus-skin/pom.xml
rm -fr src/site/site.xml
%build
-mvn-rpmbuild install
+%mvn_build
%install
-rm -rf %{buildroot}
-
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-application-skin/target/maven-application-skin-%{app_version}.jar %{buildroot}%{_javadir}/%{name}/maven-application-skin.jar
-install -m 644 maven-default-skin/target/maven-default-skin-%{def_version}.jar %{buildroot}%{_javadir}/%{name}/maven-default-skin.jar
-install -m 644 maven-classic-skin/target/maven-classic-skin-%{cla_version}.jar %{buildroot}%{_javadir}/%{name}/maven-classic-skin.jar
-install -m 644 maven-stylus-skin/target/maven-stylus-skin-%{sty_version}.jar %{buildroot}%{_javadir}/%{name}/maven-stylus-skin.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
-install -pm 644 maven-application-skin/pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-application-skin.pom
-%add_maven_depmap JPP.%{name}-maven-application-skin.pom %{name}/maven-application-skin.jar
-install -pm 644 maven-default-skin/pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-default-skin.pom
-%add_maven_depmap JPP.%{name}-maven-default-skin.pom %{name}/maven-default-skin.jar
-install -pm 644 maven-classic-skin/pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-classic-skin.pom
-%add_maven_depmap JPP.%{name}-maven-classic-skin.pom %{name}/maven-classic-skin.jar
-install -pm 644 maven-stylus-skin/pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-stylus-skin.pom
-%add_maven_depmap JPP.%{name}-maven-stylus-skin.pom %{name}/maven-stylus-skin.jar
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%mvn_install
+
+%files -f .mfiles
+
%changelog
+* Fri Feb 21 2014 Alexander Kurtakov <akurtako at redhat.com> 5-10
+- Adapt to latest guidelines.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list