rpms/gmixer/F-11 gmixer.desktop,1.1,1.2 gmixer.spec,1.1,1.2

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10018

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Sun Jun 7 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-6
- bump version as I couldn't remove CVS tag



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gmixer.desktop	22 May 2009 07:55:33 -0000	1.1
+++ gmixer.desktop	7 Jun 2009 16:11:13 -0000	1.2
@@ -5,7 +5,7 @@ Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
 Comment[fr]=Mixer audio pour l'environnement Gnome
 Exec=gmixer
-Icon=multimedia-volume-control
+Icon=gmixer
 StartupNotify=true
 Type=Application
 Categories=AudioVideo;Audio;Mixer;GTK;X-Fedora;


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gmixer.spec	22 May 2009 07:55:33 -0000	1.1
+++ gmixer.spec	7 Jun 2009 16:11:13 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -11,7 +11,9 @@ URL:            https://launchpad.net/gm
 Source0:        http://launchpad.net/gmixer/1.x/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        gmixer.desktop
 Patch0:         version_fix.patch
+Patch1:         gmixer-1.3-setup-py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	pkgconfig
 BuildRequires:  python-devel, pygtk2-codegen, pygtk2-devel, gtk2-devel
 BuildRequires:  desktop-file-utils
 Requires:       python-xlib, pygtk2, gstreamer-python
@@ -29,37 +31,61 @@ Features:
 %prep
 %setup -q
 %patch0 -p1 -b .version_fix
+%patch1 -p1 -b .gmixer-1.3-setup-py
 
 
 %build
+python setup.py build
 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT
+python setup.py install \
+  --prefix=%{_prefix} \
+  --root=$RPM_BUILD_ROOT \
+  --skip-build
+
+# icon
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 644 data/mixer.png \
+	$RPM_BUILD_ROOT%{_datadir}/pixmaps/gmixer.png
 
+# menu-entry
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %SOURCE1
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root,-) 
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc gpl.txt 
 %{_bindir}/gmixer
 %{python_sitelib}/gtktrayicon.py*
 %{python_sitelib}/volkeys.so
 %{python_sitelib}/gmixer-1.0-py?.?.egg-info
 %{_datadir}/gmixer/
 %{_datadir}/applications/gmixer.desktop
-%lang(fr) %doc %{_datadir}/locale/fr/LC_MESSAGES/gmixer.mo
+%{_datadir}/pixmaps/gmixer.png
 
 
 
 %changelog
+* Sun Jun 7 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-6
+- bump version as I couldn't remove CVS tag
+
+* Sun Jun 7 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-5
+- re-add doc 
+- add icon
+- add setup-py.patch to remove cleanup
+- add Br pkgconfig
+- use find_lang to install language files 
+ 
 * Thu May 21 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-4
 - change egg-info so it builds with any python version
 - remove doc