- use rpm features (gzipping, %%debug, %%config), automake-related changes

- release 2

Changed files:
    aumix-gtk.spec -> 1.13

diff --git a/aumix-gtk.spec b/aumix-gtk.spec
index 3d12c10193f32e6320a8d1f0d486ad0a9eaf33cf..e91584d8f7a711ac6f3b328a646186551ce9eacb 100644 (file)
--- a/aumix-gtk.spec
+++ b/aumix-gtk.spec
@@ -1,20 +1,22 @@
 # NOTE:                Please keep in sync with aumix.
 Summary:       curses and X11/Gtk ased audio mixer
 Summary(de):   Audio-Mixer auf curses- und X11/Gtk-Basis
 # NOTE:                Please keep in sync with aumix.
 Summary:       curses and X11/Gtk ased audio mixer
 Summary(de):   Audio-Mixer auf curses- und X11/Gtk-Basis

-Summary(pl):   Mikser audio bazuj±cy na curses
+Summary(pl):   Mikser audio bazuj±cy na curses i Gtk+

 Name:          aumix-gtk
 Version:       2.7
 Name:          aumix-gtk
 Version:       2.7

-Release:       1
+Release:       2

 License:       GPL
 Group:         Applications/Sound
 License:       GPL
 Group:         Applications/Sound

+Group(de):     Applikationen/Laut

 Group(pl):     Aplikacje/D¼wiêk
 Source0:       http://www.jpj.net/~trevor/aumix/aumix-%{version}.tar.gz
 Source2:       aumix.desktop
 Patch0:                aumix-home_etc.patch
 Patch1:                aumix-xaumix.patch
 URL:           http://www.jpj.net/~trevor/aumix.html
 Group(pl):     Aplikacje/D¼wiêk
 Source0:       http://www.jpj.net/~trevor/aumix/aumix-%{version}.tar.gz
 Source2:       aumix.desktop
 Patch0:                aumix-home_etc.patch
 Patch1:                aumix-xaumix.patch
 URL:           http://www.jpj.net/~trevor/aumix.html

+BuildRequires: autoconf

 BuildRequires: automake
 BuildRequires: automake

-BuildRequires: gtk+-devel
+BuildRequires: gtk+-devel >= 1.2.0

 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gpm-devel
 BuildRequires: gettext-devel
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gpm-devel
 BuildRequires: gettext-devel


@@ -49,34 +51,30 @@ poziom sygna
 %patch1 -p1
 
 %build
 %patch1 -p1
 
 %build

-automake
+aclocal

 autoconf
 autoconf

+automake -a -c

 gettextize --copy --force
 
 gettextize --copy --force
 

-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses"
-LDFLAGS="-s"
-export CFLAGS LDFLAGS
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"

 %configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_applnkdir}/Multimedia \
-       $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/pixmaps} \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
+       $RPM_BUILD_ROOT{%{_bindir},/etc/rc.d/init.d}

 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 

-mv $RPM_BUILD_ROOT%{_datadir}/aumix/*xpm \
-$RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv -f $RPM_BUILD_ROOT%{_datadir}/aumix/*xpm $RPM_BUILD_ROOT%{_pixmapsdir}

 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
 
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
 

-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       AUTHORS BUGS ChangeLog NEWS README 
+gzip -9nf AUTHORS BUGS ChangeLog NEWS README TODO

 
 %find_lang aumix
 
 
 %find_lang aumix
 


@@ -85,8 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f aumix.lang
 %defattr(644,root,root,755)
 
 %files -f aumix.lang
 %defattr(644,root,root,755)

-%config(noreplace,missingok) %{_sysconfdir}/aumixrc
-%doc {AUTHORS,BUGS,ChangeLog,NEWS,README}.gz
+%config(noreplace,missingok) %verify(not size mtime md5) %{_sysconfdir}/aumixrc
+%doc {AUTHORS,BUGS,ChangeLog,NEWS,README,TODO}.gz

 
 %attr(755,root,root) %{_bindir}/aumix
 
 
 %attr(755,root,root) %{_bindir}/aumix