[Jpackage-commits] dist/java3d/JPP-6 java3d.spec,1.1,1.2

jpackage jpackage at ryu.zarb.org
Sun Jun 13 18:10:50 CEST 2010


Update of /home/projects/jpackage/cvs/dist/java3d/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv30388

Modified Files:
	java3d.spec 
Log Message:
Add JPP header, cleanup, fix changelog

Index: java3d.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/java3d/JPP-6/java3d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** java3d.spec	13 Jun 2010 16:04:44 -0000	1.1
--- java3d.spec	13 Jun 2010 16:10:48 -0000	1.2
***************
*** 1,34 ****
! 
! #%define maj				1
! #%define min				5
! #%define rel				2
! 
! #%ifarch %ix86
! #%define target_cpu		i586
! #%define short_cpu		x86
! #%define aka_cpu			i386
! #%endif
! 
! #%ifarch x86_64
! #%define target_cpu		amd64
! #%define short_cpu		amd64
! #%define aka_cpu			amd64
! #%endif
! 
! #%ifarch ppc
! #%define target_cpu		???
! #%define short_cpu		???
! #%define aka_cpu			???
! #%endif
! 
! #%define my_requires		/tmp/my-requires
! #%define _binary_dist	0
  #
- #%ifarch %ix86 x86_64
- #%define _with_Cg		1
- #%else
- #%define _with_Cg		0
- #%endif
- 
  
  Summary:		Java 3D
--- 1,31 ----
! # Copyright (c) 2000-2010, JPackage Project
! # All rights reserved.
! #
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions
! # are met:
! #
! # 1. Redistributions of source code must retain the above copyright
! #    notice, this list of conditions and the following disclaimer.
! # 2. Redistributions in binary form must reproduce the above copyright
! #    notice, this list of conditions and the following disclaimer in the
! #    documentation and/or other materials provided with the
! #    distribution.
! # 3. Neither the name of the JPackage Project nor the names of its
! #    contributors may be used to endorse or promote products derived
! #    from this software without specific prior written permission.
! #
! # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
! # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
! # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
! # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
! # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
! # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
! # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  #
  
  Summary:		Java 3D
***************
*** 111,124 ****
  ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
  
- ## exclude libjawt.so from the requires-list (it is NOT provided by java ...)
- #%__cat << EOF > %{my_requires}
- #%{__find_requires} | grep -v "libjawt.so"
- #EOF
- #%__chmod 755 %{my_requires}
- #%define __find_requires %{my_requires}
  
  %clean
! #[ -d %{buildroot} -a "%{buildroot}" != "" ] && %__rm -rf %{buildroot}
! #%__rm -f %{my_requires}
  
  %post -p /sbin/ldconfig
--- 108,114 ----
  ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
  
  
  %clean
! %__rm -rf %{buildroot}
  
  %post -p /sbin/ldconfig
***************
*** 141,145 ****
  
  %changelog
! * Wed Feb 24 2010 Ralph Apel <r.apel at r-apel.de> - 1.5.2-1
  - Adapt to JPP-6
  
--- 131,135 ----
  
  %changelog
! * Sun Jun 13 2010 Ralph Apel <r.apel at r-apel.de> - 1.5.2-1
  - Adapt to JPP-6
  




More information about the JPackage-commits mailing list