[Jpackage-commits] dist/opends/devel opends-svnkit-CheckPrecommit.patch, 1.1, 1.2 opends.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Mon Jul 13 20:23:29 CEST 2009


Update of /home/projects/jpackage/cvs/dist/opends/devel
In directory ryu.zarb.org:/tmp/cvs-serv21282

Modified Files:
	opends-svnkit-CheckPrecommit.patch opends.spec 
Log Message:
- use glassfish-jaxb
- patch for newer svnkit


Index: opends-svnkit-CheckPrecommit.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/opends/devel/opends-svnkit-CheckPrecommit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** opends-svnkit-CheckPrecommit.patch	17 Jun 2009 08:57:19 -0000	1.1
--- opends-svnkit-CheckPrecommit.patch	13 Jul 2009 18:23:25 -0000	1.2
***************
*** 1,4 ****
! --- src/build-tools/org/opends/build/tools/CheckPrecommit.java.sav	2009-06-06 16:34:27.000000000 +0200
! +++ src/build-tools/org/opends/build/tools/CheckPrecommit.java	2009-06-06 16:40:38.000000000 +0200
  @@ -43,6 +43,8 @@
   
--- 1,4 ----
! --- src/build-tools/org/opends/build/tools/CheckPrecommit.java.sav0	2008-02-12 09:29:11.000000000 -0500
! +++ src/build-tools/org/opends/build/tools/CheckPrecommit.java	2009-07-13 13:47:47.161035167 -0400
  @@ -43,6 +43,8 @@
   
***************
*** 10,14 ****
   import org.tmatesoft.svn.core.wc.SVNRevision;
   import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
! @@ -170,8 +172,8 @@
   
   
--- 10,14 ----
   import org.tmatesoft.svn.core.wc.SVNRevision;
   import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
! @@ -170,8 +173,8 @@
   
   
***************
*** 21,22 ****
--- 21,31 ----
       try
       {
+ @@ -296,7 +299,7 @@
+        SVNPropertyData propertyData =
+             propertyClient.doGetProperty(file, "svn:eol-style",
+                                          SVNRevision.BASE,
+ -                                        SVNRevision.WORKING, false);
+ +                                        SVNRevision.WORKING);
+        if ((propertyData == null) ||
+            (! propertyData.getValue().equals("native")))
+        {

Index: opends.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/opends/devel/opends.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** opends.spec	10 Jul 2009 17:13:59 -0000	1.6
--- opends.spec	13 Jul 2009 18:23:26 -0000	1.7
***************
*** 70,75 ****
  BuildRequires:  ant-trax
  BuildRequires:  emma
! BuildRequires:  svnkit < 0:1.1.5
! BuildRequires:  svnkit >= 0:1.1.4
  BuildRequires:  aspectj
  BuildRequires:  ganymed-ssh2
--- 70,74 ----
  BuildRequires:  ant-trax
  BuildRequires:  emma
! BuildRequires:  svnkit
  BuildRequires:  aspectj
  BuildRequires:  ganymed-ssh2
***************
*** 82,86 ****
  BuildRequires:  servlet_2_5_api
  BuildRequires:  stax_1_0_api
! BuildRequires:  sun-jaxb-2.1-impl
  BuildRequires:  xerces-j2
  BuildRequires:  xml-commons-jaxp-1.3-apis
--- 81,85 ----
  BuildRequires:  servlet_2_5_api
  BuildRequires:  stax_1_0_api
! BuildRequires:  glassfish-jaxb
  BuildRequires:  xerces-j2
  BuildRequires:  xml-commons-jaxp-1.3-apis
***************
*** 96,100 ****
  Requires:  servlet_2_5_api
  Requires:  stax_1_0_api
! Requires:  sun-jaxb-2.1-impl
  Requires(post):   jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
--- 95,99 ----
  Requires:  servlet_2_5_api
  Requires:  stax_1_0_api
! Requires:  glassfish-jaxb
  Requires(post):   jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
***************
*** 149,157 ****
  ln -sf $(build-classpath jaf_1_1_api) lib/activation.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-impl.jar.no
! ln -sf $(build-classpath sun-jaxb-2.1-impl) resource/dsml/lib/jaxb-impl.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-xjc.jar.no
! ln -sf $(build-classpath sun-jaxb-2.1-impl-xjc) resource/dsml/lib/jaxb-xjc.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb1-impl.jar.no
! ln -sf $(build-classpath sun-jaxb/jaxb-impl) resource/dsml/lib/jaxb1-impl.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-api.jar.no
  ln -sf $(build-classpath jaxb_2_1_api) resource/dsml/lib/jaxb-api.jar
--- 148,156 ----
  ln -sf $(build-classpath jaf_1_1_api) lib/activation.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-impl.jar.no
! ln -sf $(build-classpath glassfish-jaxb/jaxb-impl) resource/dsml/lib/jaxb-impl.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-xjc.jar.no
! ln -sf $(build-classpath glassfish-jaxb/jaxb-xjc) resource/dsml/lib/jaxb-xjc.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb1-impl.jar.no
! ln -sf $(build-classpath glassfish-jaxb/jaxb1-impl) resource/dsml/lib/jaxb1-impl.jar
  #BUILD/opends-1.0.0/resource/dsml/lib/jaxb-api.jar.no
  ln -sf $(build-classpath jaxb_2_1_api) resource/dsml/lib/jaxb-api.jar
***************
*** 261,264 ****
--- 260,267 ----
  
  %changelog
+ * Mon Jul 13 2009 David Walluck <dwalluck at redhat.com> 0:1.0.0-3
+ - use glassfish-jaxb
+ - patch for newer svnkit
+ 
  * Fri Jul 10 2009 David Walluck <dwalluck at redhat.com> 0:1.0.0-2
  - spec cleanup




More information about the JPackage-commits mailing list