[Jpackage-commits] dist/jxta/JPP-5 jxta.spec,1.1,1.2

jpackage jpackage at ryu.zarb.org
Sat Feb 7 10:37:03 CET 2009


Update of /home/projects/jpackage/cvs/dist/jxta/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv8220

Modified Files:
	jxta.spec 
Log Message:
fix

Index: jxta.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jxta/JPP-5/jxta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jxta.spec	7 Feb 2009 09:15:21 -0000	1.1
--- jxta.spec	7 Feb 2009 09:37:01 -0000	1.2
***************
*** 31,74 ****
  %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
  
  
! Name:		jxta
! Summary:	JXTA P2P protocols
! Url:		http://www.jxta.org/
! Version:	2.3.2
! Release:	3%{dist}
! Epoch:		0
! License:	Apache 1.1 -style License
! Group:		Development/Libraries/Java
! Source0:	http://download.jxta.org/build/release/2.3.2/jxta-src-2.3.2.tar.gz
! Source1:	jxta_license.txt
! Source2:	%{name}-%{version}.pom
! Patch0:		jxta-2.3.2-build_xml.patch
! Patch1:		jxta-2.3.2-HttpMessageReceiver.patch
  
! BuildRequires:	jpackage-utils >= 0:1.7.5
! BuildRequires:	java-devel >= 0:1.5.0
! BuildRequires:	ant
! BuildRequires:	bouncycastle
! BuildRequires:	jaxen
! BuildRequires:	jdom
! BuildRequires:	jetty5
! BuildRequires:	junit
! BuildRequires:	log4j
! BuildRequires:	servlet_2_4_api
! BuildRequires:	swixml
! BuildRequires:	xerces-j2
! BuildRequires:	xml-commons-jaxp-1.3-apis
! Requires:	java >= 0:1.5.0
! Requires:	bouncycastle
! Requires:	jaxen
! Requires:	jdom
! Requires:	jetty5
! Requires:	log4j
! Requires:	servlet_2_4_api
! Requires:	swixml
! Requires:	xerces-j2
! Requires:	xml-commons-jaxp-1.3-apis
  
  Requires(post):   jpackage-utils >= 0:1.7.5
--- 31,74 ----
  %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
  
  
! Name:           jxta
! Summary:        JXTA P2P protocols
! Url:            http://www.jxta.org/
! Version:        2.3.2
! Release:        3%{dist}
! Epoch:          0
! License:        Apache 1.1 -style License
! Group:          Development/Libraries/Java
! Source0:        http://download.jxta.org/build/release/2.3.2/jxta-src-2.3.2.tar.gz
! Source1:        jxta_license.txt
! Source2:        %{name}-%{version}.pom
! Patch0:         jxta-2.3.2-build_xml.patch
! Patch1:         jxta-2.3.2-HttpMessageReceiver.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant
! BuildRequires:  bouncycastle
! BuildRequires:  jaxen
! BuildRequires:  jdom
! BuildRequires:  jetty5
! BuildRequires:  junit
! BuildRequires:  log4j
! BuildRequires:  servlet_2_4_api
! BuildRequires:  swixml
! BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-jaxp-1.3-apis
! Requires:       java >= 0:1.5.0
! Requires:       bouncycastle
! Requires:       jaxen
! Requires:       jdom
! Requires:       jetty5
! Requires:       log4j
! Requires:       servlet_2_4_api
! Requires:       swixml
! Requires:       xerces-j2
! Requires:       xml-commons-jaxp-1.3-apis
  
  Requires(post):   jpackage-utils >= 0:1.7.5
***************
*** 83,87 ****
  BuildArch:      noarch
  %endif
! BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
  
  %description
--- 83,87 ----
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
  
  %description
***************
*** 98,103 ****
  
  %package javadoc
! Summary:	Javadoc for %{name}
! Group:		Development/Documentation
  
  %description javadoc
--- 98,103 ----
  
  %package javadoc
! Summary:        Javadoc for %{name}
! Group:          Development/Documentation
  
  %description javadoc
***************
*** 109,113 ****
  cp %{SOURCE1} jxta_license.txt
  for j in $(find . -name "*.jar"); do
! 	mv $j $j.no
  done
  
--- 109,113 ----
  cp %{SOURCE1} jxta_license.txt
  for j in $(find . -name "*.jar"); do
!     mv $j $j.no
  done
  
***************
*** 138,141 ****
--- 138,142 ----
  
  %install
+ rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}




More information about the JPackage-commits mailing list