From 9802ac49dcaba5497ab68c478f1c5df542c5295c13b49abed2d5fec7c1f2b6b1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Mar 2022 13:51:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=33 --- dom4j.changes | 6 ++++++ dom4j.spec | 14 ++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dom4j.changes b/dom4j.changes index 278e3df..7397d29 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 28 13:50:07 UTC 2022 - Fridrich Strba + +- Add alias to the new artifact coordinates org.dom4j:dom4j +- Simplify the spec file a bit + ------------------------------------------------------------------- Thu Mar 17 15:40:13 UTC 2022 - Fridrich Strba diff --git a/dom4j.spec b/dom4j.spec index 7c60601..944ee2b 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -33,7 +33,7 @@ URL: https://www.dom4j.org/ # tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/ Source0: dom4j-1.6.1-debian.tar.bz2 Source1: dom4j_rundemo.sh -Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom +Source2: https://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom Patch0: dom4j-1.6.1-bug1618750.patch Patch1: dom4j-sourcetarget.patch Patch2: dom4j-javadoc.patch @@ -188,12 +188,11 @@ ant package release-javadoc # jars install -d -m 755 %{buildroot}%{_javadir} install -d -m 755 %{buildroot}%{_datadir}/maven2/poms -cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar mkdir -p %{buildroot}/%{_mavenpomdir} install -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.dom4j:dom4j" # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -213,13 +212,8 @@ install -m 0755 run.sh %{buildroot}%{_datadir}/%{name} %fdupes -s %{buildroot}%{_docdir}/%{name}-%{version} %fdupes -s %{buildroot}%{_datadir}/%{name} -%files -%defattr(0644,root,root,0755) +%files -f .mfiles %license LICENSE.txt -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml* %files javadoc %defattr(0644,root,root,0755)