- really uncommented home_etc patch, cleanups

Changed files:
    aumix-gtk.spec -> 1.44

diff --git a/aumix-gtk.spec b/aumix-gtk.spec
index 296c681337b7571060d64f2f8eeaa780bd8208f4..83ef5fa964b133eb18d7c590428fe31b6d3eb734 100644 (file)
--- a/aumix-gtk.spec
+++ b/aumix-gtk.spec
@@ -1,6 +1,8 @@
 # NOTE:                Please keep in sync with aumix.
 # NOTE:                Please keep in sync with aumix.

-%bcond_with    gtk1            # build with gtk1 instead of gtk2
-
+#
+# Conditional build:
+%bcond_with    gtk1    # build with gtk1 instead of gtk2
+#

 Summary:       curses and X11/Gtk based audio mixer
 Summary(de):   Audio-Mixer auf curses- und X11/Gtk-Basis
 Summary(es):   Mezclador de audio basado en curses y X11/gtk+
 Summary:       curses and X11/Gtk based audio mixer
 Summary(de):   Audio-Mixer auf curses- und X11/Gtk-Basis
 Summary(es):   Mezclador de audio basado en curses y X11/gtk+


@@ -27,12 +29,12 @@ BuildRequires:      gpm-devel
 %if %{with gtk1}
 BuildRequires: gtk+-devel >= 1.2.0
 %else
 %if %{with gtk1}
 BuildRequires: gtk+-devel >= 1.2.0
 %else

-BuildRequires: gtk+2-devel
+BuildRequires: gtk+2-devel >= 2.0.0

 %endif
 BuildRequires: ncurses-devel >= 5.0
 Provides:      aumix
 %endif
 BuildRequires: ncurses-devel >= 5.0
 Provides:      aumix

-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

 Obsoletes:     aumix
 Obsoletes:     aumix

+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

 
 %description
 This program provides a tty- and X11/Gtk-based, interactive method of
 
 %description
 This program provides a tty- and X11/Gtk-based, interactive method of


@@ -72,16 +74,15 @@ poziom sygna
 
 %prep
 %setup -q -n aumix-%{version}
 
 %prep
 %setup -q -n aumix-%{version}

-#%patch0 -p1
+%patch0 -p1

 %patch1 -p1
 %patch2 -p1
 
 %build
 %patch1 -p1
 %patch2 -p1
 
 %build

-#rm -f missing acinclude.m4
-rm -f missing

 #%%{__gettextize}
 %{__aclocal}
 %{__autoconf}
 #%%{__gettextize}
 %{__aclocal}
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 
 CPPFLAGS="-I/usr/include/ncurses"
 %{__automake}
 
 CPPFLAGS="-I/usr/include/ncurses"