- up to 2.9.1

diff --git a/aumix-ac250.patch b/aumix-ac250.patch
deleted file mode 100644 (file)
index 52562ad..0000000
--- a/aumix-ac250.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur aumix-2.8.orig/configure.in aumix-2.8/configure.in
---- aumix-2.8.orig/configure.in        2002-11-25 02:04:16.000000000 +0100
-+++ aumix-2.8/configure.in     2004-07-12 19:29:45.135190696 +0200
-@@ -61,30 +61,30 @@
-       [Define this if your ncurses library contains the use_default_colors
-       routine and your terminal can use transparent colors.])])
-     AC_CACHE_CHECK([for private member _use_keypad in WINDOW],
--      aumix_cv_struct_window_usekeypad,
-+      [aumix_cv_struct_window_usekeypad],
-       [AC_TRY_COMPILE([#ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
- #include <curses.h>
--#endif], [WINDOW w; w._use_keypad;],
--      aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)])
-+#endif
-+], [WINDOW w; w._use_keypad;],
-+      [aumix_cv_struct_window_usekeypad=yes],[ aumix_cv_struct_window_usekeypad=no])])
-     if test $aumix_cv_struct_window_usekeypad = yes; then
-       AC_DEFINE(HAVE_USEKEYPAD, 1,
-       [Define this if your ncurses library has the member _use_keypad
-       in structure WINDOW.])
-     fi
-   fi
--  AC_ARG_WITH(gpm,
--    [  --without-gpm           Compile only without GPM support],
--    AC_MSG_RESULT([Compiling without GPM support]),
-+])
-+  AC_ARG_WITH(gpm,[  --without-gpm           Compile only without GPM support],[
-+    AC_MSG_RESULT([Compiling without GPM support])],[
-     dnl Checks for GPM library.
-     AC_CHECK_LIB(gpm, Gpm_Repeat)
--  )
--  AC_ARG_WITH(sysmouse,
--    [  --without-sysmouse      Compile only without sysmouse support],
--    AC_MSG_RESULT([Compiling without sysmouse support]),
-+  ])
-+  AC_ARG_WITH(sysmouse,[  --without-sysmouse      Compile only without sysmouse support],[
-+    AC_MSG_RESULT([Compiling without sysmouse support])],
-     dnl Checks for sysmouse availability.
--    AC_CHECK_HEADERS(sys/consio.h machine/console.h, break)
-+    dnl AC_CHECK_HEADERS([sys/consio.h machine/console.h], [break])
-     AC_CACHE_CHECK([for CONS_MOUSECTL],
-       aumix_cv_cons_mousectl,
-       [AC_EGREP_CPP([A mouse is a mouse is a mouse],
-@@ -96,14 +96,15 @@
- #endif
- #ifdef CONS_MOUSECTL
- A mouse is a mouse is a mouse
--#endif], aumix_cv_cons_mousectl=yes, aumix_cv_cons_mousectl=no)])
-+#endif
-+],[ aumix_cv_cons_mousectl=yes],[ aumix_cv_cons_mousectl=no])])
-     if test $aumix_cv_cons_mousectl = yes; then
-       AC_DEFINE(HAVE_SYSMOUSE, 1,
-       [Define this if you have sysmouse console mouse support and
-       want to use it.])
-     fi
-   )
--])
-+
- AM_CONDITIONAL(CURSES, test "x$CURSLIB" != "x")
- AC_SUBST(CURSLIB)
- 

diff --git a/aumix-gtk.spec b/aumix-gtk.spec
index 1f13e62216b18c781e59a4d1173341ffb31e06fd..731d365e5eba6a752c363e81a0c85533e6fe821a 100644 (file)
--- a/aumix-gtk.spec
+++ b/aumix-gtk.spec
@@ -10,17 +10,16 @@ Summary(pl.UTF-8):  Mikser audio bazujący na curses i GTK+
 Summary(ru.UTF-8):     Аудио микшер на базе библиотеки curses и GTK+
 Summary(uk.UTF-8):     Аудіо мікшер, базований на біблиотеці curses і GTK+
 Name:          aumix-gtk
 Summary(ru.UTF-8):     Аудио микшер на базе библиотеки curses и GTK+
 Summary(uk.UTF-8):     Аудіо мікшер, базований на біблиотеці curses і GTK+
 Name:          aumix-gtk

-Version:       2.8
-Release:       2
+Version:       2.9.1
+Release:       1

 License:       GPL v2+
 Group:         Applications/Sound
 License:       GPL v2+
 Group:         Applications/Sound

-Source0:       http://www.jpj.net/~trevor/aumix/aumix-%{version}.tar.bz2
-# Source0-md5: dc3fc7209752207c23e7c94ab886b340
+Source0:       http://www.jpj.net/~trevor/aumix/releases/aumix-%{version}.tar.bz2
+# Source0-md5: 34f28ae1c94fc5298e8bb2688c4b3a20

 Source3:       %{name}.desktop
 Source4:       aumix.png
 Patch0:                aumix-home_etc.patch
 Patch1:                aumix-xaumix.patch
 Source3:       %{name}.desktop
 Source4:       aumix.png
 Patch0:                aumix-home_etc.patch
 Patch1:                aumix-xaumix.patch

-Patch2:                aumix-ac250.patch

 URL:           http://www.jpj.net/~trevor/aumix.html
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://www.jpj.net/~trevor/aumix.html
 BuildRequires: autoconf
 BuildRequires: automake


@@ -76,10 +75,9 @@ jak poziom sygnału wyjściowego.
 %setup -q -n aumix-%{version}
 %patch0 -p1
 %patch1 -p1
 %setup -q -n aumix-%{version}
 %patch0 -p1
 %patch1 -p1

-%patch2 -p1

 
 %build
 
 %build

-#%%{__gettextize}
+%{__gettextize}

 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}

diff --git a/aumix-home_etc.patch b/aumix-home_etc.patch
index 99e45a29f41be298e360836394cbaa49a011bdd6..528b8830119549424a5cfd53da2c063e4a1cd154 100644 (file)
--- a/aumix-home_etc.patch
+++ b/aumix-home_etc.patch
@@ -151,12 +151,12 @@ diff -Nru aumix-2.6.1/po/pt_BR.po aumix-2.6.1.new/po/pt_BR.po
  "  h:  this helpful message\n"
  msgstr ""
  "  d:  ajusta um dispositivo em /dev/mixer\n"
  "  h:  this helpful message\n"
  msgstr ""
  "  d:  ajusta um dispositivo em /dev/mixer\n"

- "  f:  especifica um arquivo para ler e gravar as configurações (o padrão é   "
--"    ~/.aumixrc or /etc/aumixrc)\n"
-+"      $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
+ "  f:  especifica um arquivo para ler e gravar as configurações (o padrão "
+-"é       ~/.aumixrc or /etc/aumixrc)\n"
++"é       $CONFIG_DIR/.aumixrc or /etc/aumixrc)\n"

  "  h:  essa mensagem de ajuda\n"
  
  "  h:  essa mensagem de ajuda\n"
  

- #: src/common.c:707
+ #: src/common.c:716

 diff -Nru aumix-2.6.1/po/ru.po aumix-2.6.1.new/po/ru.po
 --- aumix-2.6.1/po/ru.po       Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/po/ru.po   Tue Jun 27 23:16:07 2000
 diff -Nru aumix-2.6.1/po/ru.po aumix-2.6.1.new/po/ru.po
 --- aumix-2.6.1/po/ru.po       Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/po/ru.po   Tue Jun 27 23:16:07 2000


@@ -207,18 +207,6 @@ diff -Nru aumix-2.6.1/src/Makefile.am aumix-2.6.1.new/src/Makefile.am
                mouse.h play.xpm record.xpm
  localedir     = $(datadir)/locale
  INCLUDES      = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
                mouse.h play.xpm record.xpm
  localedir     = $(datadir)/locale
  INCLUDES      = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@

-diff -Nru aumix-2.6.1/src/Makefile.in aumix-2.6.1.new/src/Makefile.in
---- aumix-2.6.1/src/Makefile.in        Tue Jun 27 23:11:47 2000
-+++ aumix-2.6.1.new/src/Makefile.in    Tue Jun 27 23:11:28 2000
-@@ -100,7 +100,7 @@
- 
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--aumix_OBJECTS =  common.o curses.o dummy.o gpm-xterm.o gtk.o \
-+aumix_OBJECTS =  userdir.o common.o curses.o dummy.o gpm-xterm.o gtk.o \
- interactive.o mouse.o
- aumix_LDADD = $(LDADD)
- aumix_DEPENDENCIES = 

 diff -Nru aumix-2.6.1/src/common.c aumix-2.6.1.new/src/common.c
 --- aumix-2.6.1/src/common.c   Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/src/common.c       Wed Jun 28 00:10:45 2000
 diff -Nru aumix-2.6.1/src/common.c aumix-2.6.1.new/src/common.c
 --- aumix-2.6.1/src/common.c   Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/src/common.c       Wed Jun 28 00:10:45 2000