- version number removed from name of patch file

Changed files:
    povray-makefile_and_config.patch -> 1.1
    povray.spec -> 1.2

diff --git a/povray-makefile_and_config.patch b/povray-makefile_and_config.patch
new file mode 100644 (file)
index 0000000..ddd80f6
--- /dev/null
+++ b/povray-makefile_and_config.patch
@@ -0,0 +1,41 @@
+diff -Nur povray31.orig/source/unix/makefile povray31/source/unix/makefile
+--- povray31.orig/source/unix/makefile Sat Jun 19 03:52:24 1999
++++ povray31/source/unix/makefile      Sat Oct  9 01:58:23 1999
+@@ -51,7 +51,7 @@
+ #CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
+ 
+ # Linux compiler flags, Pentium II optimized
+-CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
++CFLAGS      = $(RPM_OPT_FLAGS) -finline-functions -ffast-math -c -ansi -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
+ 
+ # HPUX compiler flags
+ #CFLAGS      = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
+@@ -127,12 +127,12 @@
+ #default: svga
+ 
+ # Define the default POV-Ray library location
+-POVLIBDIR = /usr/local/lib/povray31
++POVLIBDIR = /usr/share/povray31
+ 
+ # Define the path under which you want POV-Ray files to be installed,
+ # typically /usr/local/bin, though Linux distributions may wish to 
+ # alter this to /usr/bin
+-POVPATH = /usr/local
++POVPATH = /usr
+ 
+ #----------------------------------------------------------------------
+ # There should be no compelling reason to customize the makefile beyond
+diff -Nur povray31.orig/source/unix/povrayrc povray31/source/unix/povrayrc
+--- povray31.orig/source/unix/povrayrc Sat May  1 12:54:55 1999
++++ povray31/source/unix/povrayrc      Sat Oct  9 02:11:49 1999
+@@ -21,8 +21,8 @@
+ ;; Search path for #include source files or command line ini files not\r
+ ;; found in the current directory.  New directories are added to the\r
+ ;; search path, up to a maximum of 25.\r
+-Library_Path=/usr/local/lib/povray31                  ;; (+Ldir)\r
+-Library_Path=/usr/local/lib/povray31/include\r
++Library_Path=/usr/share/povray31                      ;; (+Ldir)\r
++Library_Path=/usr/share/povray31/include\r
+ \r
+ \r
+ ;; Image size.\r

diff --git a/povray.spec b/povray.spec
index 73e99d73d3005cfd7ad13e64eb4c75d99c28cd39..a7e940317389891d402da64cf84e8c7ded73414f 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -1,4 +1,4 @@
-# $Revision: 1.1 $
+# $Revision: 1.2 $
 Summary:       Persistence of Vision Ray Tracer
 Summary(pl):   Persistence of Vision Ray Tracer
 Name:          povray
@@ -9,7 +9,7 @@ Group:         Applications/Graphics
 Group(pl):     Aplikacje/Grafika
 Source0:       povuni_s.tgz
 Source1:       povuni_d.tgz
-Patch0:        povray31-makefile_and_config.patch
+Patch0:        povray-makefile_and_config.patch
 URL:           http://www.povray.org/
 BuildRequires: zlib-devel
 BuildRequires: libpng-devel