[Jpackage-commits] dist/jboss-jaxrpc-api_1.1_spec/devel .cvsignore, 1.1, 1.2 jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml, 1.1, 1.2 jboss-jaxrpc-api_1.1_spec.spec, 1.2, 1.3 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Oct 7 18:32:55 CEST 2011


Update of /home/projects/jpackage/cvs/dist/jboss-jaxrpc-api_1.1_spec/devel
In directory ryu.zarb.org:/tmp/cvs-serv28971

Modified Files:
	.cvsignore jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml 
	jboss-jaxrpc-api_1.1_spec.spec sources 
Log Message:
- don't apply pom patch
- update some BuildRequires


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jaxrpc-api_1.1_spec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	3 Mar 2011 20:43:01 -0000	1.1
--- .cvsignore	7 Oct 2011 16:32:53 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jboss-jaxrpc-api_1.1_spec-1.0.0.Final.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jaxrpc-api_1.1_spec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	3 Mar 2011 20:43:01 -0000	1.1
--- sources	7 Oct 2011 16:32:53 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ ccdc558e9cf2360a9e8f5a18ebc3a595  jboss-jaxrpc-api_1.1_spec-1.0.0.Final.tar.bz2

Index: jboss-jaxrpc-api_1.1_spec.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jaxrpc-api_1.1_spec/devel/jboss-jaxrpc-api_1.1_spec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jboss-jaxrpc-api_1.1_spec.spec	3 Mar 2011 21:24:09 -0000	1.2
--- jboss-jaxrpc-api_1.1_spec.spec	7 Oct 2011 16:32:53 -0000	1.3
***************
*** 27,36 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
- %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
- %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
- %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
- %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
  %if "%{?rhel}" == "6"
--- 27,30 ----
***************
*** 53,57 ****
  %global apiversionu 1_1
  %global namedversion %{version}.%{reltag}
! %global apigroupid javax.xml
  %global apiartifactid %{apiname}-api
  
--- 47,51 ----
  %global apiversionu 1_1
  %global namedversion %{version}.%{reltag}
! %global apigroupid javax.xml.rpc
  %global apiartifactid %{apiname}-api
  
***************
*** 60,64 ****
  Name:           jboss-%{apiname}-api_%{apiversion}_spec
  Version:        1.0.0
! Release:        12%{?dist}
  Epoch:          0
  Summary:        Java API for XML-Based RPC (JAX-RPC) %{apiversion}
--- 54,58 ----
  Name:           jboss-%{apiname}-api_%{apiversion}_spec
  Version:        1.0.0
! Release:        13%{?dist}
  Epoch:          0
  Summary:        Java API for XML-Based RPC (JAX-RPC) %{apiversion}
***************
*** 66,74 ****
  URL:            http://fisheye.jboss.org/browse/JBossAS/projects/specs/tags/jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}
  Group:          Development/Libraries/Java
! # svn export http://anonsvn.jboss.org/repos/jbossas/projects/specs/tags/jboss-jaxrpc-api_1.1_spec-1.0.0.Final && tar cjf jboss-jaxrpc-api_1.1_spec-1.0.0.Final.tar.bz2 jboss-jaxrpc-api_1.1_spec-1.0.0.Final
! # Exported revision 110646.
! %if %without mead
  Source0:        jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}.tar.bz2
- %endif
  Source1:        jboss-%{apiname}-api_%{apiversion}_spec-settings.xml
  Source2:        jboss-%{apiname}-api_%{apiversion}_spec-jpp-depmap.xml
--- 60,65 ----
  URL:            http://fisheye.jboss.org/browse/JBossAS/projects/specs/tags/jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}
  Group:          Development/Libraries/Java
! # svn export -r 110646 http://anonsvn.jboss.org/repos/jbossas/projects/specs/tags/jboss-jaxrpc-api_1.1_spec-1.0.0.Final && tar cjf jboss-jaxrpc-api_1.1_spec-1.0.0.Final.tar.bz2 jboss-jaxrpc-api_1.1_spec-1.0.0.Final
  Source0:        jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}.tar.bz2
  Source1:        jboss-%{apiname}-api_%{apiversion}_spec-settings.xml
  Source2:        jboss-%{apiname}-api_%{apiversion}_spec-jpp-depmap.xml
***************
*** 82,91 ****
  Requires:       jpackage-utils
  Requires:       jboss-specs-parent >= 1.0.0-0.1.Beta2
- %if 0
  Requires:       servlet_2_5_api
- %else
- Requires:       jbossweb-servlet-2.5-api
- %endif
- 
  %if %with mead
  BuildRequires:  %{name}-mead = %{namedversion}
--- 73,77 ----
***************
*** 101,116 ****
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
! BuildRequires:  maven-project-info-reports-plugin
  BuildRequires:  maven-skins
  BuildRequires:  maven-surefire-provider-junit4
  BuildRequires:  maven-surefire-report-plugin
! BuildRequires:  mojo-maven2-plugin-taglist
  BuildRequires:  jboss-parent
  BuildRequires:  jboss-specs-parent >= 1.0.0-0.1.Beta2
- %if 0
  BuildRequires:  servlet_2_5_api
- %else
- BuildRequires:  jbossweb-servlet-2.5-api
- %endif
  %endif
  BuildArch:      noarch
--- 87,98 ----
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
! BuildRequires:  maven2-plugin-project-info-reports
  BuildRequires:  maven-skins
  BuildRequires:  maven-surefire-provider-junit4
  BuildRequires:  maven-surefire-report-plugin
! BuildRequires:  taglist-maven-plugin
  BuildRequires:  jboss-parent
  BuildRequires:  jboss-specs-parent >= 1.0.0-0.1.Beta2
  BuildRequires:  servlet_2_5_api
  %endif
  BuildArch:      noarch
***************
*** 156,168 ****
  %if %without mead
  %setup -q -n jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}
  %patch0 -p1 -b .sav0
! 
! %{__cp} -p %{SOURCE1} settings.xml
! %{__sed} -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
! %{__sed} -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! %{__sed} -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
! 
! %{__mkdir} external_repo
! %{__ln_s} %{_javadir} external_repo/JPP
  %endif
  
--- 138,144 ----
  %if %without mead
  %setup -q -n jboss-%{apiname}-api_%{apiversion}_spec-%{namedversion}
+ %if 0
  %patch0 -p1 -b .sav0
! %endif
  %endif
  
***************
*** 351,354 ****
--- 327,336 ----
  
  %changelog
+ * Fri Oct 07 2011 David Walluck <dwalluck at redhat.com> 0:1.0.0-13
+ - add sources
+ - fix depmap groupId
+ - don't apply pom patch
+ - update some BuildRequires
+ 
  * Thu Mar 03 2011 David Walluck <dwalluck at redhat.com> 0:1.0.0-12
  - disable MEAD

Index: jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jaxrpc-api_1.1_spec/devel/jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml	3 Mar 2011 20:49:24 -0000	1.1
--- jboss-jaxrpc-api_1.1_spec-jpp-depmap.xml	7 Oct 2011 16:32:53 -0000	1.2
***************
*** 1,14 ****
  <dependencies>
-    <dependency>
-       <maven>
-             <groupId>com.thoughtworks.qdox</groupId>
-             <artifactId>qdox</artifactId>
-             <version>1.9.2</version>
-         </maven>
-         <jpp>
-             <groupId>JPP</groupId>
-             <artifactId>qdox</artifactId>
-             <version>1.6.1</version>
-         </jpp>
-     </dependency>
  </dependencies>
--- 1,2 ----




More information about the JPackage-commits mailing list