[jsch] Add maven POM
by Mikolaj Izdebski
commit ade3e9a97039f5f4d3a0ff51dca854e7cd1d4ecf
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 1 15:47:37 2012 +0100
Add maven POM
jsch.spec | 13 ++++++++++++-
sources | 1 +
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/jsch.spec b/jsch.spec
index 7249a37..7920637 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -30,7 +30,7 @@
Name: jsch
Version: 0.1.48
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Pure Java implementation of SSH2
Group: Development/Libraries
@@ -48,6 +48,7 @@ Source0: http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}
# unix2dos MANIFEST.MF
Source1: MANIFEST.MF
Source2: plugin.properties
+Source3: http://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{ver...
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: java-devel >= 1.4.2
@@ -109,9 +110,16 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -pr examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
+# POM and depmap
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
%files
%{_javadir}/*.jar
%doc LICENSE.txt
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%doc %{_javadocdir}/%{name}*
@@ -123,6 +131,9 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
%changelog
+* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:0.1.48-3
+- Add maven POM
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:0.1.48-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index f9d278f..15b0236 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
9422dbbce4466be80be35b47e60dae25 jsch-0.1.48.zip
+221fa956635b67b0a0be2d35e872b370 jsch-0.1.48.pom
11 years, 5 months
[maven] Add aopalliance and cglib to maven-model-builder test dependencies
by Mikolaj Izdebski
commit f81e79ae5a0991cfbc7510442a71c6079c2ac443
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 1 13:37:49 2012 +0100
Add aopalliance and cglib to maven-model-builder test dependencies
maven.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 34a8ed1..71f65e2 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -174,6 +174,9 @@ popd
%pom_remove_plugin :animal-sniffer-maven-plugin
#fi
+%pom_add_dep aopalliance:aopalliance:any:test maven-model-builder
+%pom_add_dep cglib:cglib:any:test maven-model-builder
+
%build
mvn-rpmbuild -e install javadoc:aggregate
@@ -381,6 +384,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-19
+- Add aopalliance and cglib to maven-model-builder test dependencies
+
* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-18
- Add objectweb-asm to classpath
11 years, 5 months
[maven] Add objectweb-asm to classpath
by Mikolaj Izdebski
commit 31522b39feee94b0c69089d8309ca3daef188e9f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 1 11:25:59 2012 +0100
Add objectweb-asm to classpath
maven.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index f5dae90..34a8ed1 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -66,6 +66,7 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
BuildRequires: mojo-parent
+BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-metadata >= 1.5.5
BuildRequires: plexus-containers-container-default
BuildRequires: sisu >= 2.1.1-2
@@ -245,7 +246,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
plexus/interpolation plexus/plexus-sec-dispatcher plexus/utils \
sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \
maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \
- xbean/xbean-reflect xerces-j2 atinject aopalliance cglib slf4j
+ xbean/xbean-reflect xerces-j2 atinject aopalliance cglib slf4j objectweb-asm
# dependency of our resolver
mkdir ext/
build-jar-repository -s -p ext/ xml-commons-apis
@@ -380,6 +381,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-18
+- Add objectweb-asm to classpath
+
* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-17
- Add aopalliance, cglib, slf4j to classpath
11 years, 5 months
[maven] Add aopalliance to classpath
by Mikolaj Izdebski
commit b35ff7a5fce027b4172d189daead885d14d96984
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 1 09:58:10 2012 +0100
Add aopalliance to classpath
maven.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index edc641d..f5dae90 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -45,10 +45,12 @@ Patch201: 0004-Fix-text-scope-skipping-with-maven.test.skip.patch
BuildArch: noarch
BuildRequires: aether >= 1.13.1
+BuildRequires: aopalliance
BuildRequires: apache-commons-parent
BuildRequires: async-http-client
BuildRequires: atinject
BuildRequires: buildnumber-maven-plugin
+BuildRequires: cglib
BuildRequires: google-guice >= 3.0
BuildRequires: hamcrest
BuildRequires: maven
@@ -67,6 +69,7 @@ BuildRequires: mojo-parent
BuildRequires: plexus-containers-component-metadata >= 1.5.5
BuildRequires: plexus-containers-container-default
BuildRequires: sisu >= 2.1.1-2
+BuildRequires: slf4j
BuildRequires: sonatype-oss-parent
BuildRequires: xmlunit
%if 0%{?fedora}
@@ -242,7 +245,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
plexus/interpolation plexus/plexus-sec-dispatcher plexus/utils \
sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \
maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \
- xbean/xbean-reflect xerces-j2 atinject
+ xbean/xbean-reflect xerces-j2 atinject aopalliance cglib slf4j
# dependency of our resolver
mkdir ext/
build-jar-repository -s -p ext/ xml-commons-apis
@@ -377,8 +380,11 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-17
+- Add aopalliance, cglib, slf4j to classpath
+
* Wed Oct 31 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-16
-- Don't exho in maven-script
+- Don't echo JAVA_HOME in maven-script
- Add bash completion for -Dproject.build.sourceEncoding
* Mon Oct 29 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-15
11 years, 5 months
[joda-time] New tzdata (2012h)
by spike
commit 6a534be81f660576330c472a7b39b5156c6e6284
Author: spike <spike(a)fedoraproject.org>
Date: Thu Nov 1 02:05:15 2012 +0100
New tzdata (2012h)
.gitignore | 1 +
joda-time.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0d1d0b..ea2e93b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tzdata2008i.tar.gz
/tzdata2011f.tar.gz
/joda-time-2.1-dist.tar.gz
/tzdata2012g.tar.gz
+/tzdata2012h.tar.gz
diff --git a/joda-time.spec b/joda-time.spec
index de96844..08ea0a3 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -1,8 +1,8 @@
-%global tzversion tzdata2012g
+%global tzversion tzdata2012h
Name: joda-time
Version: 2.1
-Release: 1.%{tzversion}%{?dist}
+Release: 2.%{tzversion}%{?dist}
Summary: Java date and time API
Group: Development/Libraries
@@ -85,6 +85,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 1 2012 Chris Spike <spike(a)fedoraproject.org> 2.1-2.tzdata2012h
+- New tzdata (2012h)
+
* Sat Oct 20 2012 Chris Spike <spike(a)fedoraproject.org> 2.1-1.tzdata2012g
- Updated to 2.1
- New tzdata (2012g)
diff --git a/sources b/sources
index b6ab653..9ec1b00 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3d4017b2945d885bb1e658fca00e46a5 joda-time-2.1-dist.tar.gz
-111cd46b5c2e40b2b37ae707d48aaa50 tzdata2012g.tar.gz
+b937335e087fb85b7f8e3ce33e69184b tzdata2012h.tar.gz
11 years, 5 months