[httpcomponents-core] Update to latest upstream (4.1.3)
by Stanislav Ochotnicky
commit 61600615430f85c416b7623972ad528b0d072e79
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 16 14:04:19 2011 +0200
Update to latest upstream (4.1.3)
.gitignore | 1 +
httpcomponents-core.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7f36d5..0be04fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/httpcomponents-core-4.1-src.tar.gz
/httpcomponents-core-4.1.1-src.tar.gz
/httpcomponents-core-4.1.2-src.tar.gz
+/httpcomponents-core-4.1.3-src.tar.gz
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index f1912ee..2a8ba97 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -2,7 +2,7 @@
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
-Version: 4.1.2
+Version: 4.1.3
Release: 1%{?dist}
Group: Development/Libraries
License: ASL 2.0
@@ -85,6 +85,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Aug 16 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.3-1
+- Update to latest upstream (4.1.3)
+
* Tue Jul 26 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.2-1
- Update to latest upstream (4.1.2)
diff --git a/sources b/sources
index 9558033..d5bcfa9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d749640a550f6d9440c901ee36b705eb httpcomponents-core-4.1.2-src.tar.gz
+5e6380eecac59f178b9b7fb6f0c68d6b httpcomponents-core-4.1.3-src.tar.gz
12 years, 9 months
[plexus-digest] Use new add_maven_depmap macro
by Stanislav Ochotnicky
commit e5905d2b301da924c6855b7bcb0bef94d9fa5bb9
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 16 13:28:35 2011 +0200
Use new add_maven_depmap macro
- use more explicit filenames in %files section
- remove requires(post/postun) on jpackage-utils
plexus-digest.spec | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/plexus-digest.spec b/plexus-digest.spec
index 18e0209..f47a454 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -65,9 +65,6 @@ BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-cdc
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -96,24 +93,25 @@ mvn-rpmbuild install javadoc:javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} 1.0 JPP/%{parent} %{subname}
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%files
-%{_javadir}/plexus/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{parent}/%{subname}.jar
+%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
* Tue Jul 26 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.1-5
12 years, 9 months
[plexus-digest] Migration to plexus-containers-component-metadata
by Stanislav Ochotnicky
commit 304b1ee9d578735a3fd9ec1533c947a2e856eaf0
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Jul 26 19:15:23 2011 +0200
Migration to plexus-containers-component-metadata
...us-digest-migration-to-component-metadata.patch | 17 +++++++++++++++++
plexus-digest.spec | 19 ++++++++++---------
2 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/plexus-digest-migration-to-component-metadata.patch b/plexus-digest-migration-to-component-metadata.patch
new file mode 100644
index 0000000..c67f57b
--- /dev/null
+++ b/plexus-digest-migration-to-component-metadata.patch
@@ -0,0 +1,17 @@
+diff -Naur plexus-digest.orig/pom.xml plexus-digest/pom.xml
+--- plexus-digest.orig/pom.xml 2007-05-21 21:31:52.000000000 +0200
++++ plexus-digest/pom.xml 2011-07-26 18:54:21.375748376 +0200
+@@ -22,11 +22,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/plexus-digest.spec b/plexus-digest.spec
index a580205..18e0209 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -33,7 +33,7 @@
Name: plexus-digest
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 0
Summary: Plexus Digest / Hashcode Components
License: ASL 2.0
@@ -43,6 +43,8 @@ Source0: %{name}-%{version}-src.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/ plexus-digest/
# tar czf plexus-digest-1.1-src.tar.gz plexus-digest/
+Patch0: %{name}-migration-to-component-metadata.patch
+
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
@@ -54,12 +56,12 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: qdox >= 1.5
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-cdc
@@ -84,6 +86,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
mvn-rpmbuild install javadoc:javadoc
@@ -104,12 +107,6 @@ install -pm 644 pom.xml \
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/plexus/*
%{_mavenpomdir}/*
@@ -119,6 +116,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%doc %{_javadocdir}/*
%changelog
+* Tue Jul 26 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.1-5
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-4
- Build with maven 3.x
12 years, 9 months