- up to 2.14.1, updated config_dir,glibc,cpp patches, added gcc33 patch

Changed files:
    yiff-config_dir.patch -> 1.3
    yiff-cpp.patch -> 1.2
    yiff-gcc33.patch -> 1.1
    yiff-glibc.patch -> 1.2
    yiff.spec -> 1.17

diff --git a/yiff-config_dir.patch b/yiff-config_dir.patch
index 758517edb14097a81ce576fbb6b8c9b74189d044..128e99848b903e0419308332ed494e9abdf7a45f 100644 (file)
--- a/yiff-config_dir.patch
+++ b/yiff-config_dir.patch
@@ -35,22 +35,22 @@ diff -durN yiff2.12.4.orig/yiff/yiff.8 yiff2.12.4/yiff/yiff.8
  .SH "EXAMPLES"
  .LP 
  To run the YIFF sound server using the configuration
--file /usr/etc/yiffrc type:
-+file /etc/yiffrc type:
+-file /usr/etc/yiffrc, type:
++file /etc/yiffrc, type:
  .LP 
--/usr/sbin/yiff /usr/etc/yiffrc
-+/usr/sbin/yiff /etc/yiffrc
+-# /usr/sbin/yiff /usr/etc/yiffrc
++# /usr/sbin/yiff /etc/yiffrc
  .LP 
- More commonly a startup script would be used to run
- the YIFF sound server instead,
+ It is more common to start the YIFF sound server
+ by invoking the startup script (make sure it is written
 @@ -87,7 +87,7 @@
- is not needed. If you want yiff to run in the foreground
+ is not needed. If you want yiff to run in the foreground,
  then type:
  .LP 
--/usr/sbin/yiff /usr/etc/yiffrc \-\-foreground
-+/usr/sbin/yiff /etc/yiffrc \-\-foreground
+-# /usr/sbin/yiff /usr/etc/yiffrc \-\-foreground
++# /usr/sbin/yiff /etc/yiffrc \-\-foreground
  .SH "AUTHORS"
- See http://wolfpack.twu.net/contacts.html
+ http://wolfpack.twu.net/contacts.html
  .SH "SEE ALSO"
 diff -durN yiff2.12.3.orig/yiffconfig/config.h yiff2.12.3/yiffconfig/config.h
 --- yiff2.12.3.orig/yiffconfig/config.h        Tue Feb 13 11:57:08 2001

diff --git a/yiff-cpp.patch b/yiff-cpp.patch
index 6f18a8409e599a906444d09f40549c59e8dfd79a..1b5824585cbe92c9811c608ef111412b8fc6c26d 100644 (file)
--- a/yiff-cpp.patch
+++ b/yiff-cpp.patch
@@ -22,12 +22,54 @@
  
 --- yiff2.12.4/yiffutils/Makefile.orig Sat May  5 10:53:22 2001
 +++ yiff2.12.4/yiffutils/Makefile      Sun Feb  2 11:12:31 2003
-@@ -93,7 +93,7 @@
- # ########################################################################
- # Program Source and Header Files:
- #
--CC     = gcc
-+CC     = g++
- STDSRC = disk.cpp fio.cpp strexp.cpp string.cpp
+@@ -110,42 +110,42 @@
+       helloworld.c -o helloworld
+ 
+ yaudiocd:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
+       string.cpp \
+       yaudiocd.c -o yaudiocd
+ 
+ yclientmessage:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
+       string.cpp \
+         yclientmessage.c -o yclientmessage
+ 
+ yhost:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
+       string.cpp \
+       yhost.c -o yhost
+ 
+ ymixer:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
+       string.cpp \
+       ymixer.c -o ymixer
+ 
+ yplay:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) \
+       disk.cpp string.cpp \
+       yplay.c -o yplay
+ 
+ yrecinfo:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
+       string.cpp \
+       yrecinfo.c -o yrecinfo
+ 
+ yset:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
+       string.cpp \
+       yset.c -o yset
+ 
+ yshutdown:
+-      $(CC) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
++      $(CPP) $(CFLAGS) $(INC) $(LIB_DIR) $(LIB) $(STDSRC) \
+       string.cpp \
+       yshutdown.c -o yshutdown
  
- PROGS  = helloworld yhost ymixer yplay yrecinfo yset yshutdown

diff --git a/yiff-gcc33.patch b/yiff-gcc33.patch
new file mode 100644 (file)
index 0000000..16e5817
--- /dev/null
+++ b/yiff-gcc33.patch
@@ -0,0 +1,22 @@
+--- yiff-2.14.1/yiffconfig/yccb.c.orig 2003-06-04 09:04:10.000000000 +0200
++++ yiff-2.14.1/yiffconfig/yccb.c      2003-07-20 18:36:02.000000000 +0200
+@@ -1304,7 +1304,7 @@
+ "No Y Audio Mode selected!",
+ "There is no Y Audio Mode currently selected to apply\n\
+ values for.",
+-"You must select a Y Audio Mode from the list and then
++"You must select a Y Audio Mode from the list and then\n\
+ apply its values to the Y server.",
+               CDIALOG_ICON_ERROR,
+               CDIALOG_RESPONSE_OK | CDIALOG_RESPONSE_HELP,
+--- yiff-2.14.1/yiffutils/ymixer.c.orig        2003-06-04 09:04:09.000000000 +0200
++++ yiff-2.14.1/yiffutils/ymixer.c     2003-07-20 18:38:41.000000000 +0200
+@@ -27,7 +27,7 @@
+ Usage: ymixer [mixer] [value1] [value2] [value3] [value4] [options]\n\
+ \n\
+     [mixer] specifies the mixer channel device name, running without\n\
+-    any arguments prints a list of available mixer names.
++    any arguments prints a list of available mixer names.\n\
+ \n\
+     [value#] specify the percent values (from 0.0%%, 100.0%%) to be set.\n\
+     If no [value#] is specified then the current value is printed.\n\

diff --git a/yiff-glibc.patch b/yiff-glibc.patch
index 33f07333318f6fd2e9a7d1520aa5b5ded902c748..96c569a1d58ed7f42034ec9eef1be7c449be133c 100644 (file)
--- a/yiff-glibc.patch
+++ b/yiff-glibc.patch
@@ -5,7 +5,7 @@
  #endif
  extern const char *strseekblank(const char *s);
 +#ifndef __USE_GNU
- extern const char *strcasestr(const char *haystack, const char *needle);
+ extern char *strcasestr(const char *haystack, const char *needle);
 +#endif
  extern int strpfx(const char *str, const char *pfx);
  extern int strcasepfx(const char *str, const char *pfx);
@@ -17,7 +17,7 @@
  
  const char *strseekblank(const char *s);
 +#ifndef __USE_GNU
- const char *strcasestr(const char *haystack, const char *needle);
+ char *strcasestr(const char *haystack, const char *needle);
 +#endif
  int strpfx(const char *str, const char *pfx);
  int strcasepfx(const char *str, const char *pfx);
@@ -46,7 +46,7 @@
  
 +#ifndef __USE_ISOC99
 +
- #ifndef __FreeBSD__
+ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
  # if defined(__cplusplus) || defined(c_plusplus)
  
 @@ -14,5 +16,6 @@
@@ -63,7 +63,7 @@
  
  const char *strseekblank(const char *s);
 +#ifndef __USE_GNU
- const char *strcasestr(const char *haystack, const char *needle);
+ char *strcasestr(const char *haystack, const char *needle);
 +#endif
  int strpfx(const char *str, const char *pfx);
  int strcasepfx(const char *str, const char *pfx);
@@ -91,7 +91,7 @@
  
  const char *strseekblank(const char *s);
 +#ifndef __USE_GNU
- const char *strcasestr(const char *haystack, const char *needle);
+ char *strcasestr(const char *haystack, const char *needle);
 +#endif
  int strpfx(const char *str, const char *pfx);
  int strcasepfx(const char *str, const char *pfx);

diff --git a/yiff.spec b/yiff.spec
index 5333cd16cf4849e4496e017b7905bf38b879c0ef..4fdb20a3a7c3832e557e1a322759d831819f3fea 100644 (file)
--- a/yiff.spec
+++ b/yiff.spec
@@ -1,17 +1,18 @@
 Summary:       YIFF Sound Systems
 Summary(pl):   System d¼wiêku YIFF
 Name:          yiff
-Version:       2.12.4
+Version:       2.14.1
 Release:       1
 License:       GPL-like
 Group:         Applications/Sound
-Source0:       ftp://wolfpack.twu.net/users/wolfpack/%{name}%{version}.tar.bz2
-# Source0-md5: e114e57336c706df98f0c57873b2a4f0
+Source0:       ftp://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
+# Source0-md5: 088d8062faec8ad29a4410f6176bfdaa
 Source1:       %{name}config.desktop
 Patch0:                %{name}-config_dir.patch
 Patch1:                %{name}-glibc.patch
 Patch2:                %{name}-cpp.patch
 Patch3:                %{name}-nolibz.patch
+Patch4:                %{name}-gcc33.patch
 URL:           http://wolfpack.twu.net/YIFF/
 BuildRequires: gtk+-devel
 BuildRequires: libstdc++-devel
@@ -69,20 +70,27 @@ YIFF Sound Systems configuration utility.
 Narzêdzie konfiguracyjne do systemu d¼wiêku YIFF.
 
 %prep
-%setup -qn %{name}%{version}
+%setup -q
+bzip2 -d yiff/yiff.8.bz2
 %patch0 -p1
+bzip2 yiff/yiff.8
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-%{__make} -C libY2 CFLAGS="-shared %{rpmcflags} -fPIC -Wl,-soname=libY2.so.12"
+%{__make} -C libY2 \
+       CFLAGS="-shared %{rpmcflags} -fPIC -Wl,-soname=libY2.so.14"
 
-%{__make} -C yiff CFLAGS="%{rpmcflags}"
+%{__make} -C yiff \
+       CFLAGS="%{rpmcflags}"
 
-%{__make} -C yiffconfig CFLAGS="`gtk-config --cflags` %{rpmcflags}"
+%{__make} -C yiffconfig \
+       CFLAGS="`gtk-config --cflags` %{rpmcflags}"
 
-%{__make} -C yiffutils CFLAGS="%{rpmcflags}"
+%{__make} -C yiffutils \
+       CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -118,6 +126,8 @@ install yiff/yiffrc $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Settings
 
+bzip2 -d $RPM_BUILD_ROOT%{_mandir}/man?/*.bz2
+
 %clean
 rm -rf $RPM_BUILD_ROOT