rpms/maven-scm/devel cvsclient-20060125.pom, NONE, 1.1 maven-scm.spec, 1.10, 1.11 sources, 1.1, 1.2

Andrew Overholt overholt at fedoraproject.org
Mon Aug 31 19:03:52 UTC 2009 

Author: overholt

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10922

Modified Files:
	maven-scm.spec sources 
Added Files:
	cvsclient-20060125.pom 
Log Message:
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
- 1.0 RC1 (courtesy Deepak Bhole)
- Remove gcj support
- Add netbeans-ide11 requirement
- Change name on surefire plugin BR


--- NEW FILE cvsclient-20060125.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.netbeans.lib</groupId>
  <artifactId>cvsclient</artifactId>
  <version>20060125</version>
  <url>http://javacvs.netbeans.org/library/</url>
  <scm>
    <url>http://javacvs.netbeans.org/source/browse/javacvs/libsrc/</url>
  </scm>
  <licenses>
    <license>
      <name>Sun Public License</name>
      <url>http://www.netbeans.org/about/legal/spl.html</url>
    </license>
  </licenses>
</project>

Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- maven-scm.spec	25 Jul 2009 11:51:06 -0000	1.10
+++ maven-scm.spec	31 Aug 2009 19:03:52 -0000	1.11
@@ -28,35 +28,32 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%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 maven_settings_file %{_builddir}/%{name}/settings.xml
-%define namedversion 1.0-beta-3
+%define namedversion 1.0-rc1
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.4.b3.1.7%{?dist}
+Release:        0.5.rc1%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
-Group:          Development/Java
+Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
-Source0:        %{name}-%{version}-beta-3.tar.gz
 # svn export 
-#   http://svn.apache.org/repos/asf/maven/scm/tags/maven-scm-1.0-beta-3/
-#   maven-scm/
-# tar czf maven-scm-1.0-beta-3.tar.gz maven-scm/
+#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.0-rc1/ maven-scm/
+# tar czf maven-scm-1.0-rc1.tar.gz maven-scm/
+Source0:        %{name}-%{namedversion}.tar.gz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-mapdeps.xsl
 Source3:        %{name}-add-plexusutils-dep.xml
 
+# Keeping this here means we don't have to modify the netbeans package
+Source4:        http://repo2.maven.org/maven2/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.pom
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 2.0.4-6
@@ -65,12 +62,12 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
-BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven2-common-poms >= 1.0-3
 BuildRequires:  modello >= 1.0-0.a8
 BuildRequires:  modello-maven-plugin >= 1.0-0.a8
+BuildRequires:  netbeans-ide11 >= 6.7.1
 BuildRequires:  plexus-utils >= 1.2
 BuildRequires:  saxon-scripts
 
@@ -78,16 +75,11 @@ Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
 Requires:       modello >= 1.0-0.a8
 Requires:       modello-maven-plugin >= 1.0-0.a8
+Requires:       netbeans-ide11 >= 6.7.1
 Requires:       oro >= 2.0.8
 Requires:       plexus-utils >= 1.2
 Requires:       velocity >= 1.4
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
@@ -97,24 +89,15 @@ tools (e.g. Continum) in providing them 
 
 %package test
 Summary:        Tests for %{name}
-Group:          Development/Java
+Group:          Development/Tools
 Requires:       maven-scm = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description test
 Tests for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ls
-Requires(pre):  coreutils
-Requires(post): coreutils
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -136,6 +119,15 @@ saxon -o pom.xml pom.xml.noplexusutils.x
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
+# Doing this here means we don't have to modify the netbeans package
+mkdir -p $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
+cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
+ln -s %{_datadir}/netbeans/ide11/modules/org-netbeans-lib-cvsclient.jar \
+  $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar
+
+# We don't have svm synergy classes, so disable those tests for now
+rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
+
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
@@ -170,15 +162,10 @@ for i in `find . -name pom.xml | grep -v
         artifactname=`basename \`dirname $i\``
         jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
         cp -p $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.$artifactname.pom
-
-        # scm plugin has a different groupid
-        if [ $artifactname != "maven-scm-plugin" ]; then
-            %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
-        fi
+        %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
 done
 cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
-%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/%{name} plugin
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -194,47 +181,15 @@ done
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
-%if %{gcj_support}
-%post test
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun test
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}
@@ -247,52 +202,36 @@ fi
 %{_javadir}/%{name}/provider-bazaar*
 %{_javadir}/%{name}/provider-clearcase*
 %{_javadir}/%{name}/provider-local*
+%{_javadir}/%{name}/provider-hg*
 %{_javadir}/%{name}/provider-perforce*
 %{_javadir}/%{name}/provider-cvs-commons*
 %{_javadir}/%{name}/provider-cvsexe*
+%{_javadir}/%{name}/provider-cvsjava*
 %{_javadir}/%{name}/provider-svn-commons*
 %{_javadir}/%{name}/provider-svnexe*
 %{_javadir}/%{name}/provider-starteam*
+%{_javadir}/%{name}/provider-synergy*
 %{_javadir}/%{name}/provider-vss*
 %{_mavendepmapfragdir}
 %doc LICENSE.txt NOTICE.txt
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/api-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/client-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/manager-plexus-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-bazaar-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-clearcase-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvs-commons-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsexe-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-local-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-perforce-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-starteam-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svn-commons-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svnexe-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-vss-1.0-beta-3.jar.*
-%endif
-
 %files test
 %defattr(-,root,root,-)
 %{_javadir}/%{name}/provider-cvstest*
 %{_javadir}/%{name}/provider-svntest*
 %{_javadir}/%{name}/test*
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvstest-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/test-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svntest-1.0-beta-3.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
+- 1.0 RC1 (courtesy Deepak Bhole)
+- Remove gcj support
+- Add netbeans-ide11 requirement
+- Change name on surefire plugin BR
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.b3.1.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Mar 2007 05:10:02 -0000	1.1
+++ sources	31 Aug 2009 19:03:52 -0000	1.2
@@ -1 +1 @@
-3ff168aba7b94bb85bebfe91d91d1938  maven-scm-1.0-beta-3.tar.gz
+0c5a74ab3350d80fb2a2072eb3c7a096  maven-scm-1.0-rc1.tar.gz

More information about the scm-commits mailing list