commit 5156fc05b63857ece75a7480aee0fd9f94f76816
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Mar 20 09:44:49 2013 +0100
Update to upstream version 1.7
.gitignore | 1 +
0001-Improve-randomness-of-PBECipher-salt.patch | 89 --------------------
...us-cipher-migration-to-component-metadata.patch | 18 ----
plexus-cipher.spec | 27 +++---
sources | 3 +-
5 files changed, 15 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17a5b7e..06e5a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
plexus-cipher-1.5.tar.gz
/LICENSE-2.0.txt
+/plexus-cipher-1.7.tar.gz
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 80a88e8..884e891 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,6 +1,6 @@
Name: plexus-cipher
-Version: 1.5
-Release: 14%{?dist}
+Version: 1.7
+Release: 1%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
Group: Development/Libraries
@@ -9,13 +9,9 @@ License: ASL 2.0
URL:
https://github.com/sonatype/plexus-cipher
# git clone
https://github.com/sonatype/plexus-cipher.git
# cd plexus-cipher/
-# there is no tag 1.5 in git repository
-# git archive --format tar 6df2b65 | gzip -9 > plexus-cipher-1.5.tar.gz
+# note this is version 1.7 + our patches which were incorporated by upstream maintainer
+# git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 >
plexus-cipher-1.7.tar.gz
Source0: %{name}-%{version}.tar.gz
-Source1:
http://apache.org/licenses/LICENSE-2.0.txt
-
-Patch0: %{name}-migration-to-component-metadata.patch
-Patch1: 0001-Improve-randomness-of-PBECipher-salt.patch
BuildArch: noarch
@@ -37,6 +33,8 @@ BuildRequires: plexus-containers-component-metadata
BuildRequires: junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: plexus-digest
+BuildRequires: sisu-maven-plugin
+BuildRequires: sisu-inject-bean
Requires: jpackage-utils
Requires: java
@@ -57,10 +55,8 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
-cp %{SOURCE1} .
+# replace %{version}-SNAPSHOT with %{version}
+%pom_xpath_replace pom:project/pom:version
"<version>%{version}</version>"
%build
mvn-rpmbuild -Dmaven.test.failure.ignore=true \
@@ -80,16 +76,19 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
%files
-%doc LICENSE-2.0.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadir}/plexus/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%doc LICENSE-2.0.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/plexus/%{name}
%changelog
+* Wed Mar 13 2013 Michal Srb <msrb(a)redhat.com> - 1.7-1
+- Update to upstream version 1.7
+
* Fri Feb 08 2013 Michal Srb <msrb(a)redhat.com> - 1.5-14
- Remove unnecessary dependency on plexus-containers (#908586)
diff --git a/sources b/sources
index d120e6c..0b04675 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4c61273327f3b8cb02a5ae9ea1e491dc plexus-cipher-1.5.tar.gz
-3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+052bfc5cab808a1fe012a8f7d840f6b0 plexus-cipher-1.7.tar.gz