- updated to 2.2

- built with gtk+ interface

Changed files:
    aumix.spec -> 1.42

diff --git a/aumix.spec b/aumix.spec
index e2e22b32fb800189acd5ec8a4e2d7fb19fbe8880..c4cac8ff3be34d52b85c38a084eb8eb265693394 100644 (file)
--- a/aumix.spec
+++ b/aumix.spec
@@ -6,23 +6,23 @@ Summary(pl):  Mikser audio bazuj
 Summary(ru):   áÕÄÉÏ ÍÉËÛÅÒ ÎÁ ÂÁÚÅ ÂÉÂÌÉÏÔÅËÉ curses
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
-Version:       2.1
+Version:       2.2
 Release:       1
 License:       GPL
 Group:         Applications/Sound
 Group(pl):     Aplikacje/D¼wiêk
 Source0:       http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
-Source1:       xaumix.desktop
+#Source1:      xaumix.desktop
+Source2:       aumix.desktop
 Patch0:                aumix-home_etc.patch
-Patch1:                aumix-gtk.patch
-Patch2:                aumix-pl.po.patch
+Patch1:                aumix-pl.po.patch
 URL:           http://www.jpj.net/~trevor/aumix.html
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gpm-devel
 BuildRequires: gettext-devel
-#BuildRequires:        XFree86-devel
-#BuildRequires:        gtk+-devel >= 1.2.0
-#BuildRequires:        glib-devel >= 1.2.0
+BuildRequires: XFree86-devel
+BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: glib-devel >= 1.2.0
 BuildRoot:     /tmp/%{name}-%{version}-root
 
 %define                _applnkdir      /usr/X11R6/share/applnk
@@ -64,11 +64,11 @@ CD, 
 ËÁÒÔËÉ. ÷ÏÎÁ ÄÏÚ×ÏÌѤ ÚͦÎÀ×ÁÔÉ ÑË ×ȦÄΦ Ò¦×Φ ÓÉÇÎÁÌ¦× Ú CD, ͦËÒÏÆÏÎÕ,
 ÓÉÎÔÅÚÁÔÏÒ¦× ÎÁ Ú×ÕËÏ×¦Ê ÐÌÁÔ¦, ÔÁË ¦ ×ÉȦÄÎÉÊ Ò¦×ÅÎØ.
 
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoconf
@@ -77,8 +77,7 @@ gettextize --copy --force
 CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses"
 LDFLAGS="-s"
 export CFLAGS LDFLAGS
-%configure \
-       --without-gtk
+%configure 
 
 make
 
@@ -93,7 +92,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/xaumix $RPM_BUILD_ROOT/usr/X11R6/bin
 mv $RPM_BUILD_ROOT%{_datadir}/aumix/*xpm \
        $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        AUTHORS BUGS ChangeLog NEWS README 
@@ -111,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/X11R6/bin/xaumix
 
 /usr/X11R6/share/pixmaps/*.xpm
-%{_applnkdir}/Multimedia/xaumix.desktop
+%{_applnkdir}/Multimedia/aumix.desktop
 
 %{_datadir}/aumix
 %{_mandir}/man1/*