[maven-timestamp-plugin/f18] Remove unneeded BR: maven-timestamp-plugin
by Mikolaj Izdebski
commit d18ff15a5118f9d1821bdc54efffe30b404a0bec
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 15 10:36:14 2012 +0200
Remove unneeded BR: maven-timestamp-plugin
maven-timestamp-plugin.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/maven-timestamp-plugin.spec b/maven-timestamp-plugin.spec
index be48b9e..44fa65a 100644
--- a/maven-timestamp-plugin.spec
+++ b/maven-timestamp-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-timestamp-plugin
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provides formatted timestamps for maven builds
Group: Development/Libraries
@@ -27,7 +27,6 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-timestamp-plugin
Requires: java
Requires: jpackage-utils
@@ -90,6 +89,9 @@ install -pm 644 pom.xml \
%{_javadocdir}/%{name}
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1-4
+- Remove unneeded BR: maven-timestamp-plugin
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 7 months
[snakeyaml: 2/2] Update to upstream version 1.11
by Mikolaj Izdebski
commit f8451d0c3558257d369469d34e04bfef91e05388
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 15 06:18:50 2012 +0200
Update to upstream version 1.11
snakeyaml-spring-removal-workaround.patch | 124 -----------------------------
snakeyaml.spec | 18 +++--
sources | 2 +-
3 files changed, 12 insertions(+), 132 deletions(-)
---
diff --git a/snakeyaml.spec b/snakeyaml.spec
index 5b74aba..be3a912 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -2,8 +2,8 @@
%global group_id org.yaml
Name: snakeyaml
-Version: 1.9
-Release: 3%{?dist}
+Version: 1.11
+Release: 1%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
Group: Development/Libraries
@@ -12,17 +12,16 @@ URL: http://code.google.com/p/%{name}
# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip
-Patch0: %{name}-spring-removal-workaround.patch
-
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: maven
-BuildRequires: maven-plugin-cobertura
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: cobertura
BuildRequires: joda-time
BuildRequires: gnu-getopt
+BuildRequires: springframework
Requires: java
Requires: jpackage-utils
@@ -49,8 +48,10 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}
-%patch0 -p1
-%pom_add_dep org.codehaus.mojo:cobertura-maven-plugin:any:test
+%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin
+%pom_add_dep net.sourceforge.cobertura:cobertura:any:test
+sed -i "/<artifactId>spring</s/spring/&-core/" pom.xml
+rm -f src/test/java/examples/SpringTest.java
# remove bundled stuff
rm -rf target
@@ -88,6 +89,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.11-1
+- Update to upstream version 1.11
+
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9-3
- Remove unneeded dependencies: base64coder, gdata-java
- Convert pom.xml patch to POM macro
diff --git a/sources b/sources
index b8eb631..856e15e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78a82f2b24d6c4271c079756b5784f99 SnakeYAML-all-1.9.zip
+2a11deea0650701720b474c110693df4 SnakeYAML-all-1.11.zip
11 years, 7 months
[snakeyaml/f18] Remove unneeded dependencies: base64coder, gdata-java
by Mikolaj Izdebski
commit 95454af09b90c1c335ca88192aae4ceb9b9c1896
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 15 06:10:51 2012 +0200
Remove unneeded dependencies: base64coder, gdata-java
- Convert pom.xml patch to POM macro
...yaml-gdata+base64coder+cobertura-addition.patch | 33 --------------------
snakeyaml.depmap | 12 -------
snakeyaml.spec | 20 ++++--------
3 files changed, 7 insertions(+), 58 deletions(-)
---
diff --git a/snakeyaml.spec b/snakeyaml.spec
index d0cd374..5b74aba 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
Name: snakeyaml
Version: 1.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
Group: Development/Libraries
@@ -11,10 +11,8 @@ Group: Development/Libraries
URL: http://code.google.com/p/%{name}
# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip
-Source1: %{name}.depmap
Patch0: %{name}-spring-removal-workaround.patch
-Patch1: %{name}-gdata+base64coder+cobertura-addition.patch
BuildArch: noarch
@@ -25,15 +23,9 @@ BuildRequires: maven-plugin-cobertura
BuildRequires: maven-surefire-provider-junit4
BuildRequires: joda-time
BuildRequires: gnu-getopt
-BuildRequires: gdata-java
-BuildRequires: base64coder
-Requires: gdata-java
-Requires: base64coder
Requires: java
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
SnakeYAML features:
@@ -58,7 +50,7 @@ This package contains the API documentation for %{name}.
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p1
+%pom_add_dep org.codehaus.mojo:cobertura-maven-plugin:any:test
# remove bundled stuff
rm -rf target
@@ -69,9 +61,7 @@ rm -rf src/main/java/biz
sed -i 's/\r//g' LICENSE.txt
%build
-# gdata-java has no maven support -> depmap file needed
-# http://code.google.com/p/gdata-java-client/issues/detail?id=328
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" install
+mvn-rpmbuild install
%install
# jars
@@ -98,6 +88,10 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9-3
+- Remove unneeded dependencies: base64coder, gdata-java
+- Convert pom.xml patch to POM macro
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 7 months
[snakeyaml/f17] Fix a typo
by Mikolaj Izdebski
commit 902b22c5daebea2c2f4e931a3c9d0c8317c3357d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 15 06:09:14 2012 +0200
Fix a typo
- Resolves: rhbz#824313
snakeyaml.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/snakeyaml.spec b/snakeyaml.spec
index 31ccd63..cbd193d 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
Name: snakeyaml
Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
Group: Development/Libraries
@@ -81,7 +81,7 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -98,6 +98,10 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9-2
+- Fix a typo
+- Resolves: rhbz#824313
+
* Fri Jan 20 2012 Mo Morsi <mmorsi(a)redhat.com> - 1.9-1
- Update to latest upstream release
- patch2, patch3 no longer needed
11 years, 7 months