[sisu] Update to latest upstream version
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Feb 2 14:57:05 UTC 2011
commit a4760d37cf1315809672cb8f2a7e2e4c8dce484c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Wed Feb 2 15:56:45 2011 +0100
Update to latest upstream version
- Versionless jars & javadocs
.gitignore | 1 +
0001-Fix-shading.patch | 18 +++++++++---------
sisu.spec | 44 +++++++++++++++++++-------------------------
sources | 2 +-
4 files changed, 30 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fa64f1..71615dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
+/sisu-1.4.3.2.tar.gz
diff --git a/0001-Fix-shading.patch b/0001-Fix-shading.patch
index 218bd17..865fce9 100644
--- a/0001-Fix-shading.patch
+++ b/0001-Fix-shading.patch
@@ -1,6 +1,6 @@
-From f468c161563690c2b3a979f40bb53df329d5be47 Mon Sep 17 00:00:00 2001
+From dc9fcf7a07ea3d7f0796625523ef8bd8fc248357 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Fri, 8 Oct 2010 17:09:03 +0200
+Date: Wed, 2 Feb 2011 13:59:28 +0100
Subject: [PATCH] Fix shading
---
@@ -9,13 +9,13 @@ Subject: [PATCH] Fix shading
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
-index aa7fc26..2256ff1 100644
+index 2b129c6..6a9a9b4 100644
--- a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
+++ b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
-@@ -59,10 +59,9 @@
+@@ -58,10 +58,9 @@
</DynamicImport-Package>
<Export-Package>
- org.sonatype.inject;-noimport:=true;-split-package:=merge-first;version=${project.version},
+ org.sonatype.inject.*;-noimport:=true;-split-package:=merge-first;version=${project.version},
- javax.*|org.aopalliance.*;version=1
</Export-Package>
<Private-Package>
@@ -24,7 +24,7 @@ index aa7fc26..2256ff1 100644
</Private-Package>
</instructions>
</configuration>
-@@ -81,18 +80,12 @@
+@@ -80,18 +79,12 @@
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
@@ -46,10 +46,10 @@ index aa7fc26..2256ff1 100644
</filter>
</filters>
diff --git a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
-index 506bd3c..2045e04 100644
+index 0eef00e..48fe364 100644
--- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
+++ b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
-@@ -82,20 +82,12 @@
+@@ -81,20 +81,12 @@
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
@@ -71,5 +71,5 @@ index 506bd3c..2045e04 100644
</filter>
</filters>
--
-1.7.2.3
+1.7.3.5
diff --git a/sisu.spec b/sisu.spec
index d6c3786..444fa55 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,8 +1,6 @@
-%global githash gae9a407
-
Name: sisu
-Version: 1.4.2
-Release: 2%{?dist}
+Version: 1.4.3.2
+Release: 1%{?dist}
Summary: Sonatype dependency injection framework
@@ -10,15 +8,12 @@ Group: Development/Tools
License: ASL 2.0
URL: http://github.com/sonatype/sisu
-# it seems github has redirects plus it generates tarball on the fly
-# to get tarball go to http://github.com/sonatype/sisu/tree/sisu-1.4.2
-# click "downloads" in upper right corner
-# click "download .tar.gz"
-Source0: sonatype-sisu-sisu-%{version}-0-%{githash}.tar.gz
+# git clone git://github.com/sonatype/sisu
+# git archive --prefix="sonatype-sisu-1.4.3.2/" --format=tar sisu-1.4.3.2 > sisu-1.4.3.2.tar.gz
+Source0: %{name}-%{version}.tar.gz
Source1: %{name}-depmap.xml
Patch0: 0001-Fix-shading.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -58,7 +53,7 @@ Requires: jpackage-utils
%{summary}.
%prep
-%setup -q -n sonatype-sisu-18a9c2c
+%setup -q
%patch0 -p1
%build
@@ -71,14 +66,13 @@ mvn-jpp \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
for dir1 in sisu-inject/guice-*;do
pushd $dir1
for module in guice-*;do
- install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module-%{version}.jar
+ install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
install -pm 644 $module/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_to_maven_depmap org.sonatype.sisu.inject $module %{version} JPP/%{name} $module
done
@@ -91,22 +85,18 @@ done
pushd sisu-inject/guice-bean
module="sisu-inject-bean"
-install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module-%{version}.jar
+install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
install -pm 644 $module/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_to_maven_depmap org.sonatype.sisu $module %{version} JPP/%{name} $module
popd
pushd sisu-inject/guice-plexus
module="sisu-inject-plexus"
-install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module-%{version}.jar
+install -pm 644 $module/target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
install -pm 644 $module/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_to_maven_depmap org.sonatype.sisu $module %{version} JPP/%{name} $module
popd
-# symlinks
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-
# main poms
install -pm 644 sisu-inject/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-inject.pom
%add_to_maven_depmap org.sonatype.sisu sisu-inject %{version} JPP/%{name} inject
@@ -115,13 +105,13 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom
%add_to_maven_depmap org.sonatype.sisu sisu-parent %{version} JPP/%{name} parent
# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -144,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 2 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.3.2-1
+- Update to latest upstream version
+- Versionless jars & javadocs
+
* Mon Oct 18 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.2-2
- Add felix-framework BR
diff --git a/sources b/sources
index 33c0195..6aab513 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-431e20073e5444e9f4d9a34cc40a97ad sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
+1646c2ce79a5239f7758377e39c28d39 sisu-1.4.3.2.tar.gz
More information about the scm-commits
mailing list