rpms
/
sisu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version 

- Versionless jars & javadocs
This commit is contained in:
Stanislav Ochotnicky 2011-02-02 15:56:45 +01:00
parent 1e64290aef
commit a4760d37cf
4 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz /sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
/sisu-1.4.3.2.tar.gz

18
0001-Fix-shading.patch
View File

@ -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@redhat.com> From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Fri, 8 Oct 2010 17:09:03 +0200 Date: Wed, 2 Feb 2011 13:59:28 +0100
Subject: [PATCH] Fix shading Subject: [PATCH] Fix shading
--- ---
@ -9,13 +9,13 @@ Subject: [PATCH] Fix shading
2 files changed, 3 insertions(+), 18 deletions(-) 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 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 --- a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
+++ b/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> </DynamicImport-Package>
<Export-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 - javax.*|org.aopalliance.*;version=1
</Export-Package> </Export-Package>
<Private-Package> <Private-Package>
@ -24,7 +24,7 @@ index aa7fc26..2256ff1 100644
</Private-Package> </Private-Package>
</instructions> </instructions>
</configuration> </configuration>
@@ -81,18 +80,12 @@ @@ -80,18 +79,12 @@
<include>${project.groupId}:${project.artifactId}</include> <include>${project.groupId}:${project.artifactId}</include>
</includes> </includes>
</artifactSet> </artifactSet>
@ -46,10 +46,10 @@ index aa7fc26..2256ff1 100644
</filter> </filter>
</filters> </filters>
diff --git a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml 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 --- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
+++ b/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> <include>${project.groupId}:${project.artifactId}</include>
</includes> </includes>
</artifactSet> </artifactSet>
@ -71,5 +71,5 @@ index 506bd3c..2045e04 100644
</filter> </filter>
</filters> </filters>
-- --
1.7.2.3 1.7.3.5

44
sisu.spec
View File

@ -1,8 +1,6 @@
%global githash gae9a407
Name: sisu Name: sisu
Version: 1.4.2 Version: 1.4.3.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Sonatype dependency injection framework Summary: Sonatype dependency injection framework
@ -10,15 +8,12 @@ Group: Development/Tools
License: ASL 2.0 License: ASL 2.0
URL: http://github.com/sonatype/sisu URL: http://github.com/sonatype/sisu
# it seems github has redirects plus it generates tarball on the fly # git clone git://github.com/sonatype/sisu
# to get tarball go to http://github.com/sonatype/sisu/tree/sisu-1.4.2 # git archive --prefix="sonatype-sisu-1.4.3.2/" --format=tar sisu-1.4.3.2 > sisu-1.4.3.2.tar.gz
# click "downloads" in upper right corner Source0: %{name}-%{version}.tar.gz
# click "download .tar.gz"
Source0: sonatype-sisu-sisu-%{version}-0-%{githash}.tar.gz
Source1: %{name}-depmap.xml Source1: %{name}-depmap.xml
Patch0: 0001-Fix-shading.patch Patch0: 0001-Fix-shading.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
@ -58,7 +53,7 @@ Requires: jpackage-utils
%{summary}. %{summary}.
%prep %prep
%setup -q -n sonatype-sisu-18a9c2c %setup -q
%patch0 -p1 %patch0 -p1
%build %build
@ -71,14 +66,13 @@ mvn-jpp \
install javadoc:aggregate install javadoc:aggregate
%install %install
rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir} install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
for dir1 in sisu-inject/guice-*;do for dir1 in sisu-inject/guice-*;do
pushd $dir1 pushd $dir1
for module in guice-*;do 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 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 %add_to_maven_depmap org.sonatype.sisu.inject $module %{version} JPP/%{name} $module
done done
@ -91,22 +85,18 @@ done
pushd sisu-inject/guice-bean pushd sisu-inject/guice-bean
module="sisu-inject-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 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 %add_to_maven_depmap org.sonatype.sisu $module %{version} JPP/%{name} $module
popd popd
pushd sisu-inject/guice-plexus pushd sisu-inject/guice-plexus
module="sisu-inject-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 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 %add_to_maven_depmap org.sonatype.sisu $module %{version} JPP/%{name} $module
popd 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 # main poms
install -pm 644 sisu-inject/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-inject.pom 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 %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 %add_to_maven_depmap org.sonatype.sisu sisu-parent %{version} JPP/%{name} parent
# javadoc # javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%pre javadoc
%clean # workaround for rpm bug, can be removed in F-17
rm -rf $RPM_BUILD_ROOT [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post %post
%update_maven_depmap %update_maven_depmap
@ -144,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Feb 2 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.3.2-1
- Update to latest upstream version
- Versionless jars & javadocs
* Mon Oct 18 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.2-2 * Mon Oct 18 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.2-2
- Add felix-framework BR - Add felix-framework BR

2
sources
View File

@ -1 +1 @@
431e20073e5444e9f4d9a34cc40a97ad sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz 1646c2ce79a5239f7758377e39c28d39 sisu-1.4.3.2.tar.gz