- use our buildflags, fix usinged var comparision error

Changed files:
    compile.patch -> 1.1
    dss.spec -> 1.3
    optflags.patch -> 1.1

diff --git a/compile.patch b/compile.patch
new file mode 100644 (file)
index 0000000..57eee17
--- /dev/null
+++ b/compile.patch
@@ -0,0 +1,11 @@
+--- DarwinStreamingSrvr6.0.3-Source/./RTCPUtilitiesLib/RTCPAPPNADUPacket.h~    2008-05-06 02:28:59.000000000 +0300
++++ DarwinStreamingSrvr6.0.3-Source/./RTCPUtilitiesLib/RTCPAPPNADUPacket.h     2010-08-01 15:10:37.223423749 +0300
+@@ -202,7 +202,7 @@
+ public:
+     NaduList(): fNaduReportList(NULL), fcurrentIndexCount(0), fListSize(0) {};
+     ~NaduList() {
+-        for (int i = 0; i < fListSize; i++) {
++        for (unsigned int i = 0; i < fListSize; i++) {
+             if (fNaduReportList[i] != 0) {
+                 delete fNaduReportList[i];
+                 fNaduReportList[i] = 0;

diff --git a/dss.spec b/dss.spec
index edff5d5f50e785d130e0dcad4307cf379d617a9f..7b94f29c3fc3585335a02b6cfa9e474ceafb0ed3 100644 (file)
--- a/dss.spec
+++ b/dss.spec
@@ -8,6 +8,8 @@ Source0:        http://dss.macosforge.org/downloads/DarwinStreamingSrvr%{version}-Sourc
 # Source0-md5: ca676691db8417d05121699c0ca3d549
 Patch0:                %{name}.patch
 Patch1:                %{name}-x86_64.patch
+Patch2:                optflags.patch
+Patch3:                compile.patch
 URL:           http://dss.macosforge.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,6 +102,8 @@ Sample files for the Darwin Streaming Server.
 %setup -q -n DarwinStreamingSrvr%{version}-Source
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # patch streamingadminserver.pl
 %{__sed} -i -e  "s|/usr/local/|/usr/|g" WebAdmin/src/streamingadminserver.pl

diff --git a/optflags.patch b/optflags.patch
new file mode 100644 (file)
index 0000000..17a8b07
--- /dev/null
+++ b/optflags.patch
@@ -0,0 +1,92 @@
+--- DarwinStreamingSrvr6.0.3-Source/Buildit~   2010-08-01 15:43:58.000000000 +0300
++++ DarwinStreamingSrvr6.0.3-Source/Buildit    2010-08-01 15:52:52.789829857 +0300
+@@ -66,10 +66,10 @@
+ 
+       Linux.ppc)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=gcc
+-              CCOMP=gcc
+-              LINKER='gcc'
+-              MAKE=make
++              CPLUS=${CXX:-gcc}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-gcc}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe"
+               INCLUDE_FLAG="-include"
+@@ -90,10 +90,10 @@
+       Linux.i586 | \
+       Linux.i686)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=gcc
+-              CCOMP=gcc
+-              LINKER='gcc'
+-              MAKE=make
++              CPLUS=${CXX:-gcc}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-gcc}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
+               INCLUDE_FLAG="-include"
+@@ -111,10 +111,10 @@
+ 
+         Linux.x86_64)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=gcc
+-              CCOMP=gcc
+-              LINKER='gcc'
+-              MAKE=make
++              CPLUS=${CXX:-gcc}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-gcc}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -fPIC"
+               INCLUDE_FLAG="-include"
+@@ -132,10 +132,10 @@
+ 
+       Linux.mips)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=gcc
+-              CCOMP=gcc
+-              LINKER='egcs'
+-              MAKE=make
++              CPLUS=${CXX:-gcc}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-egcs}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe"
+               INCLUDE_FLAG="-include"
+@@ -153,10 +153,10 @@
+ 
+       FreeBSD.i386)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=gcc
+-              CCOMP=gcc
+-              LINKER="gcc"
+-              MAKE=make
++              CPLUS=${CXX:-gcc}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-gcc}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS=
+               INCLUDE_FLAG="-include"
+@@ -171,10 +171,10 @@
+ #     SunOS.sun4u)
+       SunOS.*)
+               echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-              CPLUS=g++
+-              CCOMP=gcc
+-              LINKER="g++"
+-              MAKE=make
++              CPLUS=${CXX:-g++}
++              CCOMP=${CC:-gcc}
++              LINKER=${CC:-g++}
++              MAKE=${MAKE:-make}
+               
+               COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536 -L/usr/local/lib -R/usr/local/lib"
+               INCLUDE_FLAG="-include"