[RPM (6.0)] [DIST generic] ops4j-base-1.3.0-1.jpp6

Ralph Apel <[email protected]> Thu, 20 Sep 2012 21:45:44 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : ops4j-base                   Relocations: (not relocatable)
Version     : 1.3.0                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Thu 20 Sep 2012 09:26:48 PM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries         Source RPM: (none)
Size        : 82039                            License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://www.ops4j.org/
Summary     : OPS4J utilities and extensions
Description :
Contains utility classes and extensions to be used in OPS4J
projects. Details can be found in project's JavaDoc.

---------------
Ralph Apel <[email protected]> 0:1.3.0-1
- 1.3.0
---------------
ops4j-base.src: W: source-or-patch-not-bzipped ops4j-base-pom.patch
ops4j-base.src: W: source-or-patch-not-bzipped ops4j-base-1.3.0.tgz
ops4j-base.src: W: no-signature
ops4j-base.src: W: invalid-license ASL 2.0
1 packages and 0 specfiles checked; 0 errors, 4 warnings.

---------------
Index: ops4j-base-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-base/ops4j-base-jpp-depmap.xml,v
retrieving revision 1.2
diff -u -r1.2 ops4j-base-jpp-depmap.xml
--- ops4j-base-jpp-depmap.xml	17 Jun 2011 09:40:56 -0000	1.2
+++ ops4j-base-jpp-depmap.xml	20 Sep 2012 19:45:42 -0000
@@ -12,19 +12,33 @@
    </jpp>
  </dependency>
 
-<!--
+   <dependency>
+      <maven>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>org.apache.felix.bundlerepository</artifactId>
+         <version>1.6.4</version>
+      </maven>
+      <jpp>
+         <groupId>JPP/apache-felix</groupId>
+         <artifactId>org.apache.felix.bundlerepository</artifactId>
+         <version>1.6.4</version>
+      </jpp>
+   </dependency>
+
    <dependency>
       <maven>
          <groupId>junit</groupId>
-         <artifactId>junit4</artifactId>
-         <version>4.0</version>
+         <artifactId>junit</artifactId>
+         <version>4.8.2</version>
       </maven>
       <jpp>
          <groupId>JPP</groupId>
          <artifactId>junit4</artifactId>
-         <version>4.4</version>
+         <version>4.8.2</version>
       </jpp>
    </dependency>
+
+<!--
 -->
 
 </dependencies>
Index: ops4j-base-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-base/ops4j-base-pom.patch,v
retrieving revision 1.2
diff -u -r1.2 ops4j-base-pom.patch
--- ops4j-base-pom.patch	17 Jun 2011 09:40:56 -0000	1.2
+++ ops4j-base-pom.patch	20 Sep 2012 19:45:42 -0000
@@ -1,25 +1,18 @@
---- pom.xml.sav	2011-02-21 18:31:24.000000000 +0100
-+++ pom.xml	2011-02-21 18:31:46.000000000 +0100
-@@ -46,6 +46,7 @@
-           <tagBase>https://scm.ops4j.org/repos/ops4j/qa/base</tagBase>
-         </configuration>
-       </plugin>
-+<!--
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>retrotranslator-maven-plugin</artifactId>
-@@ -62,6 +63,7 @@
-           </execution>
-         </executions>
-       </plugin>
-+-->
-     </plugins>
+--- pom.xml.sav	2012-09-19 16:35:37.335400602 +0200
++++ pom.xml	2012-09-19 16:35:56.793244692 +0200
+@@ -61,6 +61,7 @@
  
-     <pluginManagement>
-@@ -155,4 +157,4 @@
-     <module>ops4j-base-store</module> 
-   </modules>
+     <build>
+         <plugins>
++            <!--
+             <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>retrotranslator-maven-plugin</artifactId>
+@@ -77,6 +78,7 @@
+                     </execution>
+                 </executions>
+             </plugin>
++        -->
+         </plugins>
  
--</project>
-\ Kein Zeilenumbruch am Dateiende.
-+</project>
+         <pluginManagement>
Index: ops4j-base.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-base/ops4j-base.spec,v
retrieving revision 1.4
diff -u -r1.4 ops4j-base.spec
--- ops4j-base.spec	17 Jun 2011 09:40:56 -0000	1.4
+++ ops4j-base.spec	20 Sep 2012 19:45:42 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2011, JPackage Project
+# Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,26 +28,25 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define section free
 %define parent ops4j
 
 Name:           ops4j-base
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Epoch:          0
 Summary:        OPS4J utilities and extensions
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://www.ops4j.org/
-# svn export https://scm.ops4j.org/repos/ops4j/qa/base/base-1.2.2/ ops4j-base-1.2.2
-# tar czf ops4j-base-1.2.2.tgz ops4j-base-1.2.2/
+# git clone https://github.com/ops4j/org.ops4j.base.git
+# cd org.ops4j.base
+# git tag -l
+# git archive --prefix="ops4j-base-1.3.0/" --format=tar base-1.3.0 | gzip > ../../SOURCES/ops4j-base-1.3.0.tgz
 Source0:        %{name}-%{version}.tgz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-settings.xml
-Source3:        ops4j-master-1.0.4.pom
-# get it from https://scm.ops4j.org/repos/ops4j/qa/master-1.0.4/pom.xml
+Source3:        ops4j-master-2.0.0.pom
 Patch0:         ops4j-base-pom.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.5
@@ -64,22 +63,20 @@
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven-release
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  apache-commons-parent
-BuildRequires:  felix-maven2
+BuildRequires:  logback
+BuildRequires:  maven-bundle-plugin
 
 
-Requires:       java >= 0:1.6.0
+Requires:  java >= 0:1.6.0
+Requires:  logback
 
 Requires(post):   jpackage-utils >= 0:1.7.5
 Requires(postun): jpackage-utils >= 0:1.7.5
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-%else
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -111,8 +108,8 @@
 
 export M2SETTINGS=$(pwd)/maven2-settings.xml
 export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
-mkdir -p $MAVEN_REPO_LOCAL/org/ops4j/master/1.0.4/
-cp %{SOURCE3} $MAVEN_REPO_LOCAL/org/ops4j/master/1.0.4/master-1.0.4.pom
+mkdir -p $MAVEN_REPO_LOCAL/org/ops4j/master/2.0.0/
+cp %{SOURCE3} $MAVEN_REPO_LOCAL/org/ops4j/master/2.0.0/master-2.0.0.pom
 
 mvn-jpp -e \
         -s ${M2SETTINGS} \
@@ -135,17 +132,19 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-master.pom
-%add_to_maven_depmap org.ops4j master 1.0.4 JPP/%{parent} master
+%add_to_maven_depmap org.ops4j master 2.0.0 JPP/%{parent} master
 install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-base-build.pom
 %add_to_maven_depmap org.ops4j base %{version} JPP/%{parent} base-build
 
 for m in \
+         base-exec \
          base-io \
          base-lang \
          base-monitors \
          base-net \
-         base \
+         base-spi \
          base-store \
+         base \
          base-util-collections \
          base-util-property \
          base-util \
@@ -164,30 +163,14 @@
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -195,10 +178,6 @@
 %{_javadir}/%{parent}/*.jar
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -206,6 +185,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 19 2012 Ralph Apel <[email protected]> 0:1.3.0-1
+- 1.3.0
+
 * Fri Jun 17 2011 Ralph Apel <[email protected]> 0:1.2.2-1
 - 1.2.2