[javapackages/generate_javadoc] If licensing is not overriden bail instead of adding requires
by Stanislav Ochotnicky
commit bfcbb129b7f700d6ca26c21adcc59d8645823b88
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 7 11:19:59 2011 +0100
If licensing is not overriden bail instead of adding requires
macros.fjava | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 9111444..d4b07e9 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -67,13 +67,12 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
# !!! Needs to be used at the end of %install section
# There are these variables that change its behaviour:
#
-# %__javadoc_license - set if the license is in non-standard place to
-# prevent Requires on main package
+# %__javadoc_license - set if the license is in non-standard place
# %__apidocs_dir - set custom path to directory with javadocs
# (defaults to target/site/apidocs)
-# %__javadoc_skip_requires - if defined javadoc subpackage will not
-# require main package under any circumstances (useful
-# if upstream doesn't provide separate license file)
+# %__javadoc_no_license - if defined javadoc subpackage will not have
+# licensing information. Use only if if upstream
+# doesn't provide separate license file.
#
@@ -81,13 +80,13 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
%{!?__apidocs_dir: %global __apidocs_dir target/site/apidocs} \
%{expand: %{__find_javadoc_license}} \
%global __spec_install_post %{expand:%{__java_install_post}} \
+%if "%{__javadoc_license}" == "%{nil}" \
+%{?!__javadoc_no_license:echo License not found. Either set __javadoc_license to point to license file or set __javadoc_no_license if sources do not contain license file;exit 1;} \
+%endif \
%package javadoc \
Group: Documentation \
Summary: Javadoc for %{name} \
Requires: jpackage-utils \
-%if "%{__javadoc_license}" == "%{nil}" \
-%{?!__javadoc_skip_requires:Requires: %{?epoch:%{epoch}:}%{name}-%{version}} \
-%endif \
%description javadoc \
API documentation for %{name}. \
%files javadoc \
12 years, 6 months
[maven-archiver] Update to 2.4.2 upstream release.
by Alexander Kurtakov
commit e4800b71a12d08e4fe92de0d6db48e3d21116f4b
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Sun Nov 6 22:05:03 2011 +0200
Update to 2.4.2 upstream release.
.gitignore | 1 +
maven-archiver-depmap.xml | 15 ---------------
maven-archiver.spec | 16 ++++++++--------
sources | 3 +--
4 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd4378e..48e41f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-archiver-2.2-src.tgz
maven-archiver-2.4-src.tar.bz2
maven-archiver-2.4.1-src.tar.xz
+maven-archiver-2.4.2-source-release.zip
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 415079d..c203dfd 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -29,18 +29,15 @@
#
Name: maven-archiver
-Version: 2.4.1
-Release: 7%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
Epoch: 0
Summary: Maven Archiver
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/
-# svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4.1 maven-archiver
-# tar caf maven-archiver-2.4.1-src.tar.xz maven-archiver/
-Source0: %{name}-%{version}-src.tar.xz
-Source1: %{name}-depmap.xml
+Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}...
Patch0: %{name}-maven-core-dep.patch
@@ -85,14 +82,14 @@ Requires: jpackage-utils
Javadoc for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
#tests don't compile with maven 2.2.1
rm -fr src/test/java/org/apache/maven/archiver/*.java
%build
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
%install
@@ -122,6 +119,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Sun Nov 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.4.2-1
+- Update to 2.4.2 upstream release.
+
* Mon Sep 19 2011 Tomas Radej <tradej(a)redhat.com> - 0:2.4.1-7
- Fixed dep on maven-core artifact
- Minor fixes
diff --git a/sources b/sources
index 051ab68..7735b9c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-68294b974653b0cf6392a5bc91a56a57 maven-archiver-2.4-src.tar.bz2
-225ebc6dc4a89e70e94dffd9b8723dee maven-archiver-2.4.1-src.tar.xz
+439c6ee7e817f367b7c6d004d333512d maven-archiver-2.4.2-source-release.zip
12 years, 6 months
[plexus-cipher] Migration from plexus-maven-plugin to plexus-containers-component-metadata
by Jaromír Cápík
commit 9e818d5e8915627a847861d8b1695fc3d31840f0
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Fri Nov 4 17:37:32 2011 +0100
Migration from plexus-maven-plugin to plexus-containers-component-metadata
...us-cipher-migration-to-component-metadata.patch | 18 +++++++++
plexus-cipher.spec | 38 ++++++++-----------
2 files changed, 34 insertions(+), 22 deletions(-)
---
diff --git a/plexus-cipher-migration-to-component-metadata.patch b/plexus-cipher-migration-to-component-metadata.patch
new file mode 100644
index 0000000..ecedade
--- /dev/null
+++ b/plexus-cipher-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur plexus-cipher-1.5.orig/pom.xml plexus-cipher-1.5/pom.xml
+--- plexus-cipher-1.5.orig/pom.xml 2009-09-14 13:50:04.000000000 +0200
++++ plexus-cipher-1.5/pom.xml 2011-07-26 18:05:06.195978918 +0200
+@@ -25,12 +25,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.5</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 9d741d9..371c9f8 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,6 +1,6 @@
Name: plexus-cipher
Version: 1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
Group: Development/Libraries
@@ -10,6 +10,8 @@ URL: http://spice.sonatype.org
#tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
Source0: %{name}-%{version}.tar.gz
+Patch0: %{name}-migration-to-component-metadata.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -26,7 +28,7 @@ BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-container-default
BuildRequires: forge-parent
BuildRequires: spice-parent
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: plexus-digest
@@ -34,8 +36,6 @@ BuildRequires: plexus-digest
Requires: plexus-containers
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
@@ -51,47 +51,41 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q
+
+%patch0 -p1
%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.failure.ignore=true \
+ install javadoc:aggregate
%install
# jars
-install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
-
-%add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
+install -Dm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
%files
-%defattr(-,root,root,-)
%{_javadir}/plexus/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%doc NOTICE.txt
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/plexus/%{name}
%changelog
+* Tue Jul 26 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.5-6
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.5-5
- Do not require maven2.
- Build with maven (v. 3) by default.
12 years, 6 months