[snakeyaml] Patch for the issue67 test removed
by Jaromír Cápík
commit b99c3b02261256305f85920f5e9e23d17276e0bc
Author: Jaromír Cápík <jcapik(a)redhat.com>
Date: Mon Jun 20 18:01:39 2011 +0200
Patch for the issue67 test removed
snakeyaml.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/snakeyaml.spec b/snakeyaml.spec
index 324068b..e8f0bc1 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
Name: snakeyaml
Version: 1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
Group: Development/Libraries
@@ -14,10 +14,9 @@ Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.z
Source1: %{name}.depmap
Patch0: %{name}-spring-removal-workaround.patch
-Patch1: %{name}-test-fails-workaround.patch
-Patch2: %{name}-gdata+base64coder+cobertura-addition.patch
-Patch3: %{name}-issue121-file-handle-leaks.patch
-Patch4: %{name}-add-osgi-metadata.patch
+Patch1: %{name}-gdata+base64coder+cobertura-addition.patch
+Patch2: %{name}-issue121-file-handle-leaks.patch
+Patch3: %{name}-add-osgi-metadata.patch
BuildArch: noarch
@@ -64,7 +63,6 @@ This package contains the API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# remove bundled stuff
rm -rf target
@@ -110,6 +108,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Jun 20 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.8-6
+- Patch for the issue67 test removed
+
* Fri Jun 17 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.8-5
- Add osgi metadata to jar file (#713935)
12 years, 10 months
[maven-doap-plugin] Build with maven 3.
by Alexander Kurtakov
commit 2dc5e4f53609948246f2b7cff69e726c6f1fb46b
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 23:25:09 2011 +0300
Build with maven 3.
maven-doap-plugin.spec | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/maven-doap-plugin.spec b/maven-doap-plugin.spec
index dec4f26..f89a3ad 100644
--- a/maven-doap-plugin.spec
+++ b/maven-doap-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-doap-plugin
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugins which generate a DOAP file from information in a POM
Group: Development/Libraries
@@ -11,26 +11,24 @@ URL: http://maven.apache.org/plugins/maven-doap-plugin/
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-pom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
+BuildRequires: ant
BuildRequires: maven2
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: jpackage-utils
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -60,24 +58,14 @@ API documentation for %{name}.
%patch0 -b .sav
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -87,10 +75,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -98,21 +84,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-5
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[maven-ant-plugin] Build with maven 3.
by Alexander Kurtakov
commit 2dc13832bbdc14fd43173741219e63beb9d93da5
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 23:04:56 2011 +0300
Build with maven 3.
maven-ant-plugin.spec | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/maven-ant-plugin.spec b/maven-ant-plugin.spec
index 28f1f9d..7b8e3e4 100644
--- a/maven-ant-plugin.spec
+++ b/maven-ant-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-ant-plugin
Version: 2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven Ant Plugin
Group: Development/Libraries
@@ -10,34 +10,31 @@ URL: http://maven.apache.org/plugins/maven-ant-plugin
#tar jcf maven-ant-plugin-2.3.tar.bz2 maven-ant-plugin-2.3/
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-pom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: plexus-utils
BuildRequires: ant
BuildRequires: plexus-container-default
BuildRequires: maven-plugin-testing-harness
-BuildRequires: ant-nodeps
BuildRequires: junit
-Requires: maven2
+Requires: maven
Requires: java
Requires: jpackage-utils
Requires: plexus-utils
Requires: ant
Requires: plexus-container-default
-Requires: ant-nodeps
Requires: junit
Requires(post): jpackage-utils
@@ -63,22 +60,13 @@ API documentation for %{name}.
%patch0 -p0
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -86,10 +74,8 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -97,21 +83,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-6
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -125,4 +108,4 @@ rm -rf %{buildroot}
- Added epoch 1 in provides
* Fri May 28 2010 Hui Wang <huwang(a)redhat.com> - 2.3-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
12 years, 10 months
[maven-jar-plugin] Build with maven 3.
by Alexander Kurtakov
commit 6129b01da1b40362332286e4c3f7d66b3b3dcd5c
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 20:20:55 2011 +0300
Build with maven 3.
maven-jar-plugin.spec | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 5cb69a9..8fc604c 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,18 +1,17 @@
Name: maven-jar-plugin
Version: 2.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven JAR Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-jar-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-install-plugin
@@ -28,7 +27,7 @@ BuildRequires: plexus-archiver
BuildRequires: apache-commons-lang
BuildRequires: plexus-utils
BuildRequires: junit
-Requires: maven2
+Requires: maven
Requires: maven-archiver
Requires: plexus-archiver
Requires: maven-archiver
@@ -63,23 +62,14 @@ API documentation for %{name}.
sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-jar-plugin %{version} JPP maven-jar-plugin
@@ -89,10 +79,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -100,21 +88,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.3.1-3
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[maven-changelog-plugin] Build with maven 3
by Alexander Kurtakov
commit a03dfb2c493581444770cac2e295aba98d63f3ae
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 20:15:10 2011 +0300
Build with maven 3
maven-changelog-plugin.spec | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
---
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index 7d8de5b..00ff08a 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changelog-plugin
Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Produce SCM changelog reports
Group: Development/Libraries
@@ -9,20 +9,19 @@ URL: http://maven.apache.org/plugins/maven-changelog-plugin/
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin...
#tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared
BuildRequires: maven-doxia
BuildRequires: maven-scm
@@ -32,7 +31,7 @@ BuildRequires: maven-plugin-testing-harness
BuildRequires: plexus-container-default
BuildRequires: netbeans-cvsclient
-Requires: maven2
+Requires: maven
Requires: java
Requires: jpackage-utils
Requires: plexus-utils
@@ -62,23 +61,14 @@ API documentation for %{name}.
%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -88,10 +78,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -99,21 +87,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-7
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -134,4 +119,4 @@ rm -rf %{buildroot}
- Add missing requires
* Mon May 31 2010 Hui Wang <huwang(a)redhat.com> - 2.2-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
12 years, 10 months
[maven-ejb-plugin] Build with maven 3
by Alexander Kurtakov
commit e16f828624b6c4eca4d9831e84c2a8fb026e80ca
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 20:09:27 2011 +0300
Build with maven 3
maven-ejb-plugin.spec | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/maven-ejb-plugin.spec b/maven-ejb-plugin.spec
index 7200375..181a8e6 100644
--- a/maven-ejb-plugin.spec
+++ b/maven-ejb-plugin.spec
@@ -1,19 +1,18 @@
Name: maven-ejb-plugin
Version: 2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven EJB Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-ejb-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -27,7 +26,7 @@ BuildRequires: plexus-archiver
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-surefire-provider-junit
-Requires: maven2
+Requires: maven
Requires: java
Requires: jpackage-utils
Requires: maven-archiver
@@ -55,26 +54,17 @@ API documentation for %{name}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-ejb-plugin %{version} JPP maven-ejb-plugin
@@ -84,10 +74,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -95,21 +83,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-3
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[Bug 713935] New: snakeyaml doesn't export OSGi dependency information
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: snakeyaml doesn't export OSGi dependency information
https://bugzilla.redhat.com/show_bug.cgi?id=713935
Summary: snakeyaml doesn't export OSGi dependency information
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: snakeyaml
AssignedTo: jcapik(a)redhat.com
ReportedBy: nathanael(a)gnat.ca
QAContact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Description of problem:
I can't build yedit against the rpm because the jar file/META-INFO/MANIFEST.mf
lacks the Export-Package lines. I was told on #fedora-java to look at
httpcomponents-client to see a similar patch for the pom.xml file. the plugin
instructions need a Export-Package lines in the pom.xml. Unfortunately I'm too
much of a java noob to know how to do it and provide you patch.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 10 months
[snakeyaml] Add osgi metadata to jar file (#713935)
by Stanislav Ochotnicky
commit 65d01457beef7827f6bb1e2850dc3e2d84d1717c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 17 08:52:56 2011 +0200
Add osgi metadata to jar file (#713935)
snakeyaml-add-osgi-metadata.patch | 26 ++++++++++++++++++++++++++
snakeyaml.spec | 7 ++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/snakeyaml-add-osgi-metadata.patch b/snakeyaml-add-osgi-metadata.patch
new file mode 100644
index 0000000..0993191
--- /dev/null
+++ b/snakeyaml-add-osgi-metadata.patch
@@ -0,0 +1,26 @@
+diff --git a/pom.xml b/pom.xml
+index 4bf5a5e..8bc6e54 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -3,7 +3,7 @@
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.8</version>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+@@ -226,6 +226,12 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <version>2.3.4</version>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+ <reporting>
diff --git a/snakeyaml.spec b/snakeyaml.spec
index bc51b3c..324068b 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
Name: snakeyaml
Version: 1.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
Group: Development/Libraries
@@ -17,6 +17,7 @@ Patch0: %{name}-spring-removal-workaround.patch
Patch1: %{name}-test-fails-workaround.patch
Patch2: %{name}-gdata+base64coder+cobertura-addition.patch
Patch3: %{name}-issue121-file-handle-leaks.patch
+Patch4: %{name}-add-osgi-metadata.patch
BuildArch: noarch
@@ -63,6 +64,7 @@ This package contains the API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# remove bundled stuff
rm -rf target
@@ -108,6 +110,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.8-5
+- Add osgi metadata to jar file (#713935)
+
* Thu Jun 09 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.8-4
- File handle leaks patched
12 years, 10 months
[maven-eclipse-plugin] Build with maven 3.x.
by Alexander Kurtakov
commit cdf60da7cabd65f341c609d19bd8df9df132f143
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 05:46:27 2011 +0300
Build with maven 3.x.
kill-bsh.patch | 45 +++++++++++++++++++++++++++++++++++++++
maven-eclipse-plugin-depmap.xml | 25 ---------------------
maven-eclipse-plugin.spec | 40 +++++++++++++---------------------
3 files changed, 60 insertions(+), 50 deletions(-)
---
diff --git a/kill-bsh.patch b/kill-bsh.patch
new file mode 100644
index 0000000..e7db682
--- /dev/null
+++ b/kill-bsh.patch
@@ -0,0 +1,45 @@
+--- pom.xml.sav 2011-06-17 05:34:44.000000000 +0300
++++ pom.xml 2011-06-17 05:41:02.591296595 +0300
+@@ -220,42 +220,6 @@ under the License.
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-antrun-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>verify-integration-tests-checks</id>
+- <phase>post-integration-test</phase>
+- <configuration>
+- <tasks>
+- <property name="script" location="verify-integration-tests-checks.bsh" />
+- <script language="beanshell" src="${script}" />
+- </tasks>
+- </configuration>
+- <goals>
+- <goal>run</goal>
+- </goals>
+- </execution>
+- </executions>
+- <dependencies>
+- <dependency>
+- <groupId>org.apache.ant</groupId>
+- <artifactId>ant-nodeps</artifactId>
+- <version>1.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.ant</groupId>
+- <artifactId>ant-apache-bsf</artifactId>
+- <version>1.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>org.beanshell</groupId>
+- <artifactId>bsh</artifactId>
+- <version>2.0b4</version>
+- </dependency>
+- </dependencies>
+- </plugin>
+- <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
diff --git a/maven-eclipse-plugin-depmap.xml b/maven-eclipse-plugin-depmap.xml
index 79d5386..9c9fde5 100644
--- a/maven-eclipse-plugin-depmap.xml
+++ b/maven-eclipse-plugin-depmap.xml
@@ -3,18 +3,6 @@
This will be fixed with time by the Third-Party project. -->
<dependency>
<maven>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-resources</artifactId>
- <version>1.0-alpha-7</version>
- </maven>
- <jpp>
- <groupId>JPP/plexus</groupId>
- <artifactId>resources</artifactId>
- <version>1.0</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.4.0</version>
@@ -25,17 +13,4 @@
<version>2.4.0</version>
</jpp>
</dependency>
- <!-- <dependency>
- <maven>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>3.3.0-v20070604</version>
- </maven>
- <jpp>
- <groupId>JPP/org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>3.5.2</version>
- </jpp>
- </dependency>
- -->
</dependencies>
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index bdfc9d0..f7b33b7 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-eclipse-plugin
Version: 2.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
@@ -24,8 +24,7 @@ Patch0: %{name}-pom.patch
# In a7, the same API throw an extra IOException, the patch is tested to be
# safe. But it should be removed when a7 is ready.
Patch1: %{name}-install-plugin-mojo.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: kill-bsh.patch
BuildArch: noarch
@@ -34,7 +33,7 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
@@ -45,7 +44,7 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-tools
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-archiver
BuildRequires: maven-shared-osgi
@@ -68,7 +67,7 @@ BuildRequires: saxpath
Requires: java
-Requires: maven2
+Requires: maven
Requires: apache-commons-io
Requires: plexus-resources
Requires: jpackage-utils
@@ -95,9 +94,9 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}
-
-%patch0
%patch1
+sed -i -e "s|3.3.0-v20070604|3.7.100.v20110510-0712|g" pom.xml
+%patch2
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -107,7 +106,7 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
cp %{SOURCE1} %{name}-depmap.xml
export MAVEN_DEPMAP=$(pwd)/%{name}-depmap.xml
-CORE_FAKE_VERSION="3.5.2-v201004121342"
+CORE_FAKE_VERSION="3.7.100.v20110510-0712"
CORE_PLUGIN_DIR=$MAVEN_REPO_LOCAL/org/eclipse/core/resources/$CORE_FAKE_VERSION
mkdir -p $CORE_PLUGIN_DIR
@@ -115,17 +114,13 @@ plugin_file=`ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*jar`
ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
-mvn-jpp \
- -e \
+mvn-rpmbuild -e \
-Dmaven.test.skip=true \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file=${MAVEN_DEPMAP} \
+ -Dmaven.local.depmap.file=${MAVEN_DEPMAP} \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
@@ -141,10 +136,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -152,21 +145,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.8-5
+- Build with maven 3.x.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[maven-plugin-cobertura] BuildRequires: maven-surefire-provider-junit4
by Alexander Kurtakov
commit 71256c5a62aea64c1cb632558b4c7014ed9c9703
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 05:44:35 2011 +0300
BuildRequires: maven-surefire-provider-junit4
maven-plugin-cobertura.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/maven-plugin-cobertura.spec b/maven-plugin-cobertura.spec
index a30c7c2..aeb4487 100644
--- a/maven-plugin-cobertura.spec
+++ b/maven-plugin-cobertura.spec
@@ -18,6 +18,7 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
12 years, 10 months