packages: gnome-alsamixer/gnome-alsamixer-paths.patch, gnome-alsamixer/gnom...

[baggins]

Author: baggins                      Date: Tue Jun  8 12:42:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- updated to current svn/trunk version

---- Files affected:
packages/gnome-alsamixer:
   gnome-alsamixer-paths.patch (1.1 -> 1.2) , gnome-alsamixer.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/gnome-alsamixer/gnome-alsamixer-paths.patch
diff -u packages/gnome-alsamixer/gnome-alsamixer-paths.patch:1.1 packages/gnome-alsamixer/gnome-alsamixer-paths.patch:1.2
--- packages/gnome-alsamixer/gnome-alsamixer-paths.patch:1.1	Sat May 14 21:52:29 2005
+++ packages/gnome-alsamixer/gnome-alsamixer-paths.patch	Tue Jun  8 14:42:00 2010
@@ -15,8 +15,8 @@
      g_signal_connect (G_OBJECT (gam_app), "delete_event",
                        G_CALLBACK (gam_app_delete_cb), NULL);
  
--    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR "/gnome-alsamixer-icon.png");
-+    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR "/gnome-alsamixer.png");
+-    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer-icon.png");
++    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer.png");
  
      gnome_app_create_menus_with_data (GNOME_APP (gam_app), menubar_uiinfo, gam_app);
  

================================================================
Index: packages/gnome-alsamixer/gnome-alsamixer.spec
diff -u packages/gnome-alsamixer/gnome-alsamixer.spec:1.26 packages/gnome-alsamixer/gnome-alsamixer.spec:1.27
--- packages/gnome-alsamixer/gnome-alsamixer.spec:1.26	Wed Jan  6 01:39:14 2010
+++ packages/gnome-alsamixer/gnome-alsamixer.spec	Tue Jun  8 14:42:00 2010
@@ -3,20 +3,25 @@
 Summary(pl.UTF-8):	Mikser ALSA dla GNOME
 Name:		gnome-alsamixer
 Version:	0.9.6
-Release:	4
+Release:	5
 License:	GPL
 Group:		X11/Applications/Sound
 Source0:	ftp://ftp.paw.co.za/pub/PAW/sources/%{name}-%{version}.tar.gz
 # Source0-md5:	387623cfeb079d78325eed2d6bc94251
 Source1:	%{name}.desktop
-Patch0:		%{name}-gtk24.patch
-Patch1:		%{name}-paths.patch
+Patch0:		%{name}-svn.patch
+Patch1:		%{name}-gtk24.patch
+Patch2:		%{name}-paths.patch
+Patch3:		%{name}-ignore-delimiters.patch
+Patch4:		%{name}-schemas.patch
+Patch5:		%{name}-gconf-keys.patch
 URL:		http://www.paw.co.za/projects/gnome-alsamixer/
+BuildRequires:	GConf2-devel >= 2.8.0
 BuildRequires:	alsa-lib >= 0.9.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common
-BuildRequires:	gtk+2 >= 2.2.0
+BuildRequires:	gtk+2 >= 2.4.0
 BuildRequires:	libgnomeui-devel >= 2.2.0
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
@@ -32,14 +37,19 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
+
 %{__make}
 
 %install
@@ -53,15 +63,24 @@
 mv $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}/%{name}-icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 rm -rf $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+%gconf_schema_install gnome-alsamixer.schemas
+
+%preun
+%gconf_schema_uninstall gnome-alsamixer.schemas
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
+%{_sysconfdir}/gconf/schemas/gnome-alsamixer.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +88,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/06/08 12:42:00  baggins
+- rel 5
+- updated to current svn/trunk version
+
 Revision 1.26  2010/01/06 00:39:14  sparky
 - BR: gnome-common
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-alsamixer/gnome-alsamixer-paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-alsamixer/gnome-alsamixer.spec?r1=1.26&r2=1.27&f=u