[env-switcher-cvs] CVS: modules-oscar/dist modules-oscar.spec,1.13,1.14

[Jeff S. <jsq...@us...>]

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv7954

Modified Files:
	modules-oscar.spec 
Log Message:
Suggestions from Tom Naughton to work around RPM 4.2 issues


Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** modules-oscar.spec	27 Oct 2002 13:23:35 -0000	1.13
--- modules-oscar.spec	17 Jul 2003 13:51:51 -0000	1.14
***************
*** 1,5 ****
  #
! # Copyright (c) 2002 The Trustees of Indiana University.  
! #                    All rights reserved.
  #
  # This file is part of the modules-oscar software package.  For
--- 1,5 ----
  #
! # Copyright (c) 2002-2003 The Trustees of Indiana University.  
! #                         All rights reserved.
  #
  # This file is part of the modules-oscar software package.  For
***************
*** 19,22 ****
--- 19,26 ----
  %define _profiledir /etc/profile.d
  
+ # Added to get around RPM 4.2 debugging additions (starting in RH 8.0)
+ %define debug_package %{nil}
+ %define __check_files %{nil}
+ 
  
  #############################################################################
***************
*** 29,33 ****
  Name: modules-oscar
  Version: 3.1.6
! Release: 2
  License: GPL
  Group: Applications/Environment
--- 33,37 ----
  Name: modules-oscar
  Version: 3.1.6
! Release: 3
  License: GPL
  Group: Applications/Environment
***************
*** 317,321 ****
  %clean
  
! # Fix the hacks we did in %install to save an existing modules install...
  
  %__rm -rf %{_moddir}
--- 321,326 ----
  %clean
  
! # Fix the hacks we did in "% install" to save an existing modules
! # install...
  
  %__rm -rf %{_moddir}
***************
*** 357,360 ****
--- 362,375 ----
  #############################################################################
  %changelog
+ * Wed Jul 16 2003  21:02:42PM    Thomas Naughton  <nau...@or...>
+ - Release 3.1.6-3
+ - Mods to work with new RPM 4.2 issues:
+    o defined debug_package=nil to override the default Debuginfo which
+      caused a bomb
+    o defined __check_files=nil to override default as suggested for
+      legacy apps, see also '/usr/lib/rpm/macros'
+    o if encounter section name twice (even in comments) freaks out so
+      I added a space BTW "% install" and "% prep" in a few places.
+ 
  * Sun Oct 27 2002 Jeff Squyres <jsq...@la...>
  - Added AUTHORS.OSCAR and LICENSE.OSCAR files to %doc
***************
*** 386,390 ****
    source files were missing.  Made all the additional files into a
    real tarball, so the SRPM contains two tarballs.  Added additional
!   logic in %prep to make this all work properly.
  - Ensure to save %{_profiledir}/00-modules.* if they already exist
    while building this RPM.
--- 401,405 ----
    source files were missing.  Made all the additional files into a
    real tarball, so the SRPM contains two tarballs.  Added additional
!   logic in "% prep" to make this all work properly.
  - Ensure to save %{_profiledir}/00-modules.* if they already exist
    while building this RPM.