Attachment 606825 Details for Bug 851490 – Added maven pom - Fixes according to new guidelines for fc19

[patch] Added maven pom - Fixes according to new guidelines for fc19

0001-Added-maven-pom-Fixes-according-to-new-guidelines.patch (text/plain), 4.66 KB, created by gil cattaneo on 2012-08-24 10:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-08-24 10:33:17 UTC

Size: 4.66 KB

patch

obsolete

>From 46cc7dd2b9486f4cc1d1470ab10639179e0e423c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 24 Aug 2012 12:32:25 +0200
>Subject: [PATCH] Added maven pom - Fixes according to new guidelines
>
>---
> dnsjava-2.1.3.pom |    6 +++
> dnsjava.spec      |   88 +++++++++++++++++++++++++++++-----------------------
> 2 files changed, 55 insertions(+), 39 deletions(-)
> create mode 100644 dnsjava-2.1.3.pom
>
>diff --git a/dnsjava-2.1.3.pom b/dnsjava-2.1.3.pom
>new file mode 100644
>index 0000000..735e913
>--- /dev/null
>+++ b/dnsjava-2.1.3.pom
>@@ -0,0 +1,6 @@
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>dnsjava</groupId>
>+  <artifactId>dnsjava</artifactId>
>+  <version>2.1.3</version>
>+</project>
>\ No newline at end of file
>diff --git a/dnsjava.spec b/dnsjava.spec
>index bb15835..0ed5f4c 100644
>--- a/dnsjava.spec
>+++ b/dnsjava.spec
>@@ -1,32 +1,32 @@
> # Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
> # But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
>-%define do_not_test 1
>-
>-Name:		dnsjava
>-Version:		2.1.3
>-Release:		2%{?dist}
>-Summary:		Java DNS implementation
>-License:		BSD and MIT
>-URL:			http://www.dnsjava.org/
>-Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
>-Group:		System Environment/Libraries
>-#Epoch:		0
>-#Vendor:		JPackage Project
>-#Distribution:	JPackage
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
>-
>-BuildRequires:	ant, jpackage-utils >= 0:1.5
>-
>-BuildRequires:	java-devel >= 1.7
>-Requires:		java >= 1.7
>-Requires:		jpackage-utils
>-BuildArch:	noarch
>+%global do_not_test 1
>+
>+Name:          dnsjava
>+Version:       2.1.3
>+Release:       3%{?dist}
>+Summary:       Java DNS implementation
>+Group:         System Environment/Libraries
>+License:       BSD and MIT
>+URL:           http://www.dnsjava.org/
>+Source0:       http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
>+Source1:       %{name}-%{version}.pom
>+# bz#842582
>+Patch0:        dnsjava-2.0.6-java1.5.target.patch
>+#Epoch:        0
>+#Vendor:       JPackage Project
>+#Distribution: JPackage
>+
>+BuildRequires: ant
>+BuildRequires: java-devel >= 1.7
>+BuildRequires: jpackage-utils >= 0:1.5
> 
> # For tests
>-BuildRequires:	ant-junit
>+BuildRequires: ant-junit
> 
>-# bz#842582
>-Patch0:		dnsjava-2.0.6-java1.5.target.patch
>+Requires:      java >= 1.7
>+Requires:      jpackage-utils
>+BuildArch:     noarch
> 
> %description
> dnsjava is an implementation of DNS in Java. It supports all of the common
>@@ -49,11 +49,12 @@ well as allowing additional resolver properties to be set.
> A 'dig' clone and a dynamic update program are included, as well as a
> primary-only server.
> 
>-%package		javadoc
>-Summary:		Javadoc for %{name}
>-Group:		Documentation
>+%package javadoc
>+Summary:       Javadoc for %{name}
>+Group:         Documentation
>+Requires:      jpackage-utils
> 
>-%description	javadoc
>+%description javadoc
> Javadoc for %{name}.
> 
> %prep
>@@ -71,19 +72,20 @@ export CLASSPATH=%(build-classpath jce)
> ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs
> 
> %install
>-rm -rf %{buildroot}
> 
> # jars
> mkdir -p %{buildroot}%{_javadir}
>-cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
>-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
>+cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
>+
>+# pom and depmap
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
> # javadoc
>-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
>-cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
> 
>-%clean
>-rm -rf %{buildroot}
> 
> %if ! 0%{?do_not_test}
> %check
>@@ -93,16 +95,24 @@ ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
> %endif
> 
> %files
>-%defattr(-,root,root,-)
> %doc Changelog README USAGE examples.html *.java
> %{_javadir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
>-%files javadoc
>-%defattr(-,root,root,-)
>-%doc %{_javadocdir}/%{name}-%{version}
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-17
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
>+%files javadoc
>+%doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Fri Aug 24 2012 gil cattaneo <puntogil@libero.it> - 2.1.3-3
>+- Added maven pom
>+- Fixes according to new guidelines (versionless jars, javadocs)
>+
> * Sun Aug 12 2012 Pavel Alexeev <Pahan@Hubbitus.info> - 2.1.3-2
> - Update to 2.1.3.
> - Add Patch0: dnsjava-2.0.6-java1.5.target.patch to compile with 1.5 java target (bz#842582).
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 851490: 606820 | 606821 | 606824 | 606825