[maven-shared] Update to upstream version 20
by Mikolaj Izdebski
commit fe653047197ee9a03fda95bbe4e9b8e51ebf996b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Apr 2 12:21:26 2014 +0200
Update to upstream version 20
.gitignore | 1 +
maven-shared.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7de6059..8f22f89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-shared-components-15.tar.gz
/maven-shared-components-19.tar.gz
+/maven-shared-components-20.tar.gz
diff --git a/maven-shared.spec b/maven-shared.spec
index 9353c7c..ab2fec6 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -31,8 +31,8 @@
Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
-Version: 19
-Release: 5%{?dist}
+Version: 20
+Release: 1%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -73,6 +73,9 @@ chmod -R go=u-w *
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Apr 2 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 20-1
+- Update to upstream version 20
+
* Fri Sep 27 2013 Michal Srb <msrb(a)redhat.com> - 19-5
- Regenerate provides
diff --git a/sources b/sources
index 606c03a..4b4af14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aff2f806668d11e704475a0541068456 maven-shared-components-19.tar.gz
+acbe89ec920260d36d1fa259a2926910 maven-shared-components-20.tar.gz
10 years, 1 month
[maven-parent] Update to upstream version 24
by Mikolaj Izdebski
commit 036ab7fe738604104a6fc62195b77d71245af993
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Apr 2 12:19:09 2014 +0200
Update to upstream version 24
.gitignore | 1 +
maven-parent.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19c82d0..afc233f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/maven-parent-20-source-release.zip
/maven-parent-23-source-release.zip
+/maven-parent-24-source-release.zip
diff --git a/maven-parent.spec b/maven-parent.spec
index a937315..c561da8 100644
--- a/maven-parent.spec
+++ b/maven-parent.spec
@@ -1,5 +1,5 @@
Name: maven-parent
-Version: 23
+Version: 24
Release: 1%{?dist}
Summary: Apache Maven parent POM
License: ASL 2.0
@@ -26,6 +26,9 @@ Apache Maven parent POM file used by other Maven projects.
%doc LICENSE NOTICE
%changelog
+* Wed Apr 2 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 24-1
+- Update to upstream version 24
+
* Mon Mar 10 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 23-1
- Update to upstream version 23
diff --git a/sources b/sources
index c6a0de5..6d61ecf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf6f95604f31bd840e961d45216c2077 maven-parent-23-source-release.zip
+16f41cd279bef087499305f4f5d4686f maven-parent-24-source-release.zip
10 years, 1 month
[metadata-extractor2/f20: 2/2] use XMvn (#1049586)
by gil
commit 3cbd2d468523044eb95f3655a7c3ab7328f482ba
Merge: aaa5e7d 683a0e2
Author: gil <puntogil(a)libero.it>
Date: Wed Apr 2 12:16:05 2014 +0200
use XMvn (#1049586)
metadata-extractor2.spec | 60 +++++----------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
---
diff --cc metadata-extractor2.spec
index 897e442,db458fa..22e67d0
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@@ -67,37 -49,15 +49,18 @@@ rm -r Tests/com/drew/metadata/icc/IccRe
sed -i 's/\r//' LICENSE-2.0.txt README.txt
- %patch0 -p0
-
%build
- %if %with_maven
+%mvn_file : %{name}
- %if %{?fedora} > 19
+%mvn_alias : "drew:metadata-extractor"
+%mvn_compat_version : %{version} %{majorversion}
- %endif
+ %mvn_file :metadata-extractor %{name}
+ %mvn_alias :metadata-extractor "drew:metadata-extractor"
+ %mvn_compat_version ":metadata-extractor" %{majorversion}
%mvn_build
- %else
- ant dist-binaries javadoc
- %endif
%install
-
- %if %with_maven && %{?fedora} > 19
%mvn_install
- %else
- mkdir -p %{buildroot}%{_javadir}
- install -m 644 target/metadata-extractor-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
- mkdir -p %{buildroot}%{_mavenpomdir}
- install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
- %add_maven_depmap -a "drew:metadata-extractor" -v "%{majorversion}"
-
- mkdir -p %{buildroot}%{_javadocdir}/%{name}
- cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
- %endif
%jpackage_script com.drew.imaging.ImageMetadataReader "" "" %{name}-%{majorversion}:xmpcore %{name} true
@@@ -117,10 -69,9 +72,9 @@@
%doc LICENSE-2.0.txt
%changelog
+ * Wed Apr 02 2014 gil cattaneo <puntogil(a)libero.it> 2.6.4-3
-- fix rhbz#1068933
++- fix rhbz#1049586
+
* Mon Oct 21 2013 gil cattaneo <puntogil(a)libero.it> 2.6.4-2
- fix script
10 years, 1 month
[metadata-extractor2] provides metadata-extractor (#1068933)
by gil
commit 683a0e22781dd8b928c6bf36abf0df0c7b0e395c
Author: gil <puntogil(a)libero.it>
Date: Wed Apr 2 11:41:27 2014 +0200
provides metadata-extractor (#1068933)
metadata-extractor2.spec | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
---
diff --git a/metadata-extractor2.spec b/metadata-extractor2.spec
index 1814fda..db458fa 100644
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@ -1,7 +1,7 @@
%global majorversion 2
Name: metadata-extractor2
Version: 2.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Extracts EXIF, IPTC and XMP metadata from image files
License: ASL 2.0
URL: http://drewnoakes.com/code/exif/
@@ -15,11 +15,8 @@ BuildRequires: mvn(com.adobe.xmp:xmpcore)
BuildRequires: mvn(xerces:xercesImpl)
# Test deps
BuildRequires: mvn(junit:junit)
-
BuildRequires: maven-local
-%if %{?fedora} <= 19
Provides: mvn(com.drewnoakes:metadata-extractor) = %{version}-%{release}
-%endif
BuildArch: noarch
%description
@@ -55,50 +52,26 @@ sed -i 's/\r//' LICENSE-2.0.txt README.txt
%build
%mvn_file :metadata-extractor %{name}
-%if %{?fedora} > 19
%mvn_alias :metadata-extractor "drew:metadata-extractor"
%mvn_compat_version ":metadata-extractor" %{majorversion}
-%endif
%mvn_build
%install
-%if %{?fedora} > 19
%mvn_install
-%else
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/metadata-extractor-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a "drew:metadata-extractor" -v "%{majorversion}"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%endif
%jpackage_script com.drew.imaging.ImageMetadataReader "" "" %{name}-%{majorversion}:xmpcore %{name} true
-%if %{?fedora} > 19
%files -f .mfiles
-%else
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%endif
%{_bindir}/*
%doc LICENSE-2.0.txt README.txt
-%if %{?fedora} > 19
%files javadoc -f .mfiles-javadoc
-%else
-%files javadoc
-%{_javadocdir}/%{name}
-%endif
%doc LICENSE-2.0.txt
%changelog
+* Wed Apr 02 2014 gil cattaneo <puntogil(a)libero.it> 2.6.4-3
+- fix rhbz#1068933
+
* Mon Oct 21 2013 gil cattaneo <puntogil(a)libero.it> 2.6.4-2
- fix script
10 years, 1 month
[java-oauth] Use Requires: java-headless rebuild (#1067528)
by gil
commit 86702efb7c2cf0ca8b0d2a90b3f3cc397873d162
Author: gil <puntogil(a)libero.it>
Date: Wed Apr 2 11:17:19 2014 +0200
Use Requires: java-headless rebuild (#1067528)
java-oauth.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/java-oauth.spec b/java-oauth.spec
index e338dc5..9d3962f 100644
--- a/java-oauth.spec
+++ b/java-oauth.spec
@@ -1,7 +1,7 @@
%global oname oauth
Name: java-oauth
Version: 20100601
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: An open protocol to allow API authentication
License: ASL 2.0
Url: http://code.google.com/p/oauth/
@@ -72,6 +72,9 @@ This package contains javadoc for %{name}.
%doc LICENSE.txt
%changelog
+* Wed Apr 02 2014 gil cattaneo <puntogil(a)libero.it> 20100601-8
+- Use Requires: java-headless rebuild (#1067528)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20100601-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 1 month
