[jbosgi-repository/f17] Initial import

Marek Goldmann goldmann at fedoraproject.org
Thu Jun 28 14:02:43 UTC 2012


commit 4e20714a9815c33380034582692ff82389dd97da
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Thu Jun 28 16:02:29 2012 +0200

    Initial import

 .gitignore                                 |    1 +
 0001-Drop-osgi.enterprise-dependency.patch |   62 ++++++++++++++
 0002-Disable-itests-module.patch           |   24 +++++
 jbosgi-repository.spec                     |  126 ++++++++++++++++++++++++++++
 sources                                    |    1 +
 5 files changed, 214 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..9380f84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jbosgi-repository-1.0.5.Final.tar.xz
diff --git a/0001-Drop-osgi.enterprise-dependency.patch b/0001-Drop-osgi.enterprise-dependency.patch
new file mode 100644
index 0000000..d635c5e
--- /dev/null
+++ b/0001-Drop-osgi.enterprise-dependency.patch
@@ -0,0 +1,62 @@
+From a473d527b948efde5b74777bf14d2397a1daaca1 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 08:34:31 +0200
+Subject: [PATCH 1/2] Drop osgi.enterprise dependency
+
+---
+ bundle/pom.xml |    5 -----
+ core/pom.xml   |    5 -----
+ pom.xml        |    5 -----
+ 3 files changed, 15 deletions(-)
+
+diff --git a/bundle/pom.xml b/bundle/pom.xml
+index c6cc06b..3fdec2e 100644
+--- a/bundle/pom.xml
++++ b/bundle/pom.xml
+@@ -41,11 +41,6 @@
+             <artifactId>org.osgi.core</artifactId>
+             <scope>provided</scope>
+         </dependency>
+-        <dependency>
+-            <groupId>org.osgi</groupId>
+-            <artifactId>org.osgi.enterprise</artifactId>
+-            <scope>provided</scope>
+-        </dependency>
+     </dependencies>
+ 
+     <build>
+diff --git a/core/pom.xml b/core/pom.xml
+index a62df20..f3c2206 100644
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -40,11 +40,6 @@
+             <artifactId>org.osgi.core</artifactId>
+             <scope>provided</scope>
+         </dependency>
+-        <dependency>
+-            <groupId>org.osgi</groupId>
+-            <artifactId>org.osgi.enterprise</artifactId>
+-            <scope>provided</scope>
+-        </dependency>
+ 
+         <!-- Test Dependencies -->
+         <dependency>
+diff --git a/pom.xml b/pom.xml
+index 8ef475a..e1572c1 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -87,11 +87,6 @@
+                 <version>${version.osgi}</version>
+             </dependency>
+             <dependency>
+-                <groupId>org.osgi</groupId>
+-                <artifactId>org.osgi.enterprise</artifactId>
+-                <version>${version.osgi}</version>
+-            </dependency>
+-            <dependency>
+                 <groupId>junit</groupId>
+                 <artifactId>junit</artifactId>
+                 <version>${version.junit}</version>
+-- 
+1.7.10.2
+
diff --git a/0002-Disable-itests-module.patch b/0002-Disable-itests-module.patch
new file mode 100644
index 0000000..28d8ca3
--- /dev/null
+++ b/0002-Disable-itests-module.patch
@@ -0,0 +1,24 @@
+From 3df966919a2358549540e610ce89dc6f94879a98 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 08:42:11 +0200
+Subject: [PATCH 2/2] Disable itests module
+
+---
+ pom.xml |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index e1572c1..6076f64 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -105,7 +105,6 @@
+         <module>core</module>
+         <module>bundle</module>
+         <module>plugins</module>
+-        <module>itests</module>
+     </modules>
+ 
+ </project>
+-- 
+1.7.10.2
+
diff --git a/jbosgi-repository.spec b/jbosgi-repository.spec
new file mode 100644
index 0000000..72cb9f8
--- /dev/null
+++ b/jbosgi-repository.spec
@@ -0,0 +1,126 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+
+Name:             jbosgi-repository
+Version:          1.0.5
+Release:          2%{?dist}
+Summary:          JBossOSGi Repository
+Group:            Development/Libraries
+License:          LGPLv2+
+URL:              http://community.jboss.org/wiki/JBossOSGi
+
+# git clone git://github.com/jbosgi/jbosgi-repository.git
+# cd jbosgi-repository/ && git archive --format=tar --prefix=jbosgi-repository-1.0.5.Final/ 1.0.5.Final | xz > jbosgi-repository-1.0.5.Final.tar.xz
+Source0:          jbosgi-repository-%{namedversion}.tar.xz
+
+# Not needed, causes compilation errors
+Patch0:           0001-Drop-osgi.enterprise-dependency.patch
+# We don't have test classes available to compile it
+Patch1:           0002-Disable-itests-module.patch
+
+BuildArch:        noarch
+
+BuildRequires:    jpackage-utils
+BuildRequires:    java-devel
+BuildRequires:    maven
+BuildRequires:    maven-compiler-plugin
+BuildRequires:    maven-install-plugin
+BuildRequires:    maven-jar-plugin
+BuildRequires:    maven-javadoc-plugin
+BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    jbosgi-parent
+BuildRequires:    arquillian-core
+BuildRequires:    arquillian-osgi
+BuildRequires:    jboss-logmanager
+BuildRequires:    jbosgi-resolver
+BuildRequires:    jbosgi-framework
+BuildRequires:    shrinkwrap
+BuildRequires:    shrinkwrap-resolver
+BuildRequires:    felix-osgi-core
+BuildRequires:    junit
+BuildRequires:    mockito
+
+Requires:         jpackage-utils
+Requires:         java
+Requires:         arquillian-core
+Requires:         arquillian-osgi
+Requires:         jboss-logmanager
+Requires:         jbosgi-resolver
+Requires:         jbosgi-framework
+Requires:         shrinkwrap
+Requires:         shrinkwrap-resolver
+Requires:         felix-osgi-core
+
+%description
+This package contains the JBoss OSGi Repository.
+
+%package javadoc
+Summary:          Javadocs for %{name}
+Group:            Documentation
+Requires:         jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n jbosgi-repository-%{namedversion}
+
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.dll' -exec rm -f '{}' \;
+
+%patch0 -p1
+%patch1 -p1
+
+%build
+# We need to use Maven3 explicitly because otherwise Maven2 classes are used...
+mvn-rpmbuild -Dmaven.local.depmap.file=%{_mavendepmapfragdir}/maven install javadoc:aggregate
+
+%install
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+for m in api core ; do
+  # JAR
+  install -pm 644 ${m}/target/jbosgi-repository-${m}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
+  # POM
+  install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
+  # DEPMAP
+  %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
+done
+
+# JAR
+install -pm 644 bundle/target/jbosgi-repository-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
+install -pm 644 plugins/shrinkwrap/target/jbosgi-repository-plugin-shrinkwrap-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-plugin-shrinkwrap.jar
+
+# POM
+install -pm 644 bundle/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+install -pm 644 plugins/shrinkwrap/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-plugin-shrinkwrap.pom
+install -pm 644 plugins/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-plugins.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+
+# DEPMAP
+%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
+%add_maven_depmap JPP.%{name}-%{name}-plugin-shrinkwrap.pom %{name}/%{name}-plugin-shrinkwrap.jar
+%add_maven_depmap JPP.%{name}-%{name}-plugins.pom
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom
+
+# APIDOCS
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%files
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+%changelog
+* Thu Jun 28 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.5-2
+- Removed binaries
+- Typo fixes
+
+* Fri Jun 15 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.5-1
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..0998481 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+881d940f51103341f7ce69772a524e57  jbosgi-repository-1.0.5.Final.tar.xz


More information about the scm-commits mailing list