[pegdown] switch to XMvn
gil
gil at fedoraproject.org
Fri Jul 5 21:51:00 UTC 2013
commit e1eb41a7ed6cf44d515934a8a28abed1e24c5d13
Author: gil <puntogil at libero.it>
Date: Fri Jul 5 23:50:46 2013 +0200
switch to XMvn
pegdown.spec | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
---
diff --git a/pegdown.spec b/pegdown.spec
index c154d3c..a537e7c 100644
--- a/pegdown.spec
+++ b/pegdown.spec
@@ -1,16 +1,12 @@
Name: pegdown
Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java library for Markdown processing
-Group: Development/Libraries
License: ASL 2.0
URL: http://pegdown.org
-# git clone git://github.com/sirthias/pegdown.git pegdown-1.1.0
-# cd pegdown-1.1.0/ && git archive --format=tar --prefix=pegdown-1.1.0/ 1.1.0 | xz > ../pegdown-1.1.0-src-git.tar.xz
-Source0: %{name}-%{version}-src-git.tar.xz
+Source0: https://github.com/sirthias/pegdown/archive/%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: parboiled
# test deps
@@ -18,18 +14,8 @@ BuildRequires: jtidy
BuildRequires: testng
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: parboiled
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -37,15 +23,13 @@ A pure-Java Markdown processor based on a parboiled PEG parser
supporting a number of extensions.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
-%setup -q -n pegdown-%{version}
+%setup -q
find . -name "*.class" -delete
find . -name "*.jar" -delete
@@ -56,31 +40,23 @@ rm src/test/java/org/pegdown/PegDownTest.java
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%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 JPP-%{name}.pom %{name}.jar
-
-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 CHANGELOG LICENSE NOTICE README.markdown
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Fri Jul 05 2013 gil cattaneo <puntogil at libero.it> 1.1.0-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list