[gnaural/f19: 2/2] New version.

[Christopher Meng]

commit d5033550d5a6d112542752a65b4e87d45712a043
Author: Koji <koji at fedoraproject.org>
Date:   Mon Aug 26 14:33:21 2013 +0800

    New version.

 .gitignore   |    1 +
 gnaural.spec |   70 +++++++++++++++++++++++----------------------------------
 sources      |    2 +-
 3 files changed, 30 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4acfbf5..70d00a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnaural-1.0.20100408.tar.gz
+/gnaural-1.0.20110606.tar.gz
diff --git a/gnaural.spec b/gnaural.spec
index 46f2b7f..a19dc56 100644
--- a/gnaural.spec
+++ b/gnaural.spec
@@ -1,14 +1,11 @@
 Name:           gnaural
-Version:        1.0.20100408
-Release:        7%{?dist}
+Version:        1.0.20110606
+Release:        1%{?dist}
 Summary:        A multi-platform programmable binaural-beat generator
-
-Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://gnaural.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk2-devel, libglade2-devel, libsndfile-devel
+URL:            http://gnaural.sourceforge.net
+Source0:        http://downloads.sourceforge.net/project/%{name}/Gnaural/%{name}-%{version}.tar.gz
+BuildRequires:  gtk2-devel libglade2-devel libsndfile-devel
 BuildRequires:  portaudio-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -24,73 +21,62 @@ also be linked over the internet, allowing synchronous sessions
 between many users.
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL="install -p" DESTDIR=%{buildroot}
 
-install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+install -p -dm 755 %{buildroot}%{_datadir}/pixmaps
+install -p -dm 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
 install -p -m 644 pixmaps/%{name}-icon.xpm \
- $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+ %{buildroot}%{_datadir}/pixmaps
 install -p -m 644 pixmaps/%{name}-icon.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
-install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
+install -p -dm 755 %{buildroot}%{_datadir}/applications
 
 sed -i -e 's|^Categories=.*$|Categories=AudioVideo;AudioVideoEditing;|g' \
  -e 's|^Encoding=UTF-8$||g' \
  -e 's|^GenericName=Audio binaural beat editor/generator$||g' \
  -e 's|^Icon=.*$|Icon=%{name}-icon|g' \
- $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Multimedia/%{name}.desktop
+ %{buildroot}/%{_datadir}/gnome/apps/Multimedia/%{name}.desktop
 
 desktop-file-install \
---dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Multimedia/%{name}.desktop
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/gnome
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+--dir=%{buildroot}%{_datadir}/applications \
+%{buildroot}%{_datadir}/gnome/apps/Multimedia/%{name}.desktop
 
+rm -rf %{buildroot}%{_datadir}/gnome
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/%{name}.glade
-%dir %{_datadir}/%{name}/pixmaps
-%{_datadir}/%{name}/pixmaps/%{name}-icon.*
+%{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}-icon.xpm
-%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png
-
+%{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 
 %changelog
+* Sun Aug 25 2013 Christopher Meng <rpm at cicku.me> - 1.0.20110606-1
+- Update to new version.
+- Update icon cache refresh script.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20100408-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c42d09a..39e69b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d476edbdb156b0b15c569e38245abee8  gnaural-1.0.20100408.tar.gz
+8eea03a78ba02ee5d13c55fc6c0c9a00  gnaural-1.0.20110606.tar.gz