rpms/alsamixergui/devel alsamixergui-modernfix.patch, NONE, 1.1 alsamixergui.desktop, NONE, 1.1 alsamixergui.png, NONE, 1.1 alsamixergui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alsamixergui-modernfix.patch alsamixergui.desktop 
	alsamixergui.png alsamixergui.spec 
Log Message:
auto-import alsamixergui-0.9.0-0.2.rc1 on branch devel from alsamixergui-0.9.0-0.2.rc1.src.rpm

alsamixergui-modernfix.patch:

--- NEW FILE alsamixergui-modernfix.patch ---
--- alsamixergui-0.9.0rc1-2/configure.BAD	2006-01-16 12:28:52.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/configure	2006-01-16 12:39:24.000000000 -0600
@@ -1476,17 +1476,17 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lfltk  $LIBS"
+LIBS="-lfltk -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1482 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char numericsort();
+char fl_numericsort();
 
 int main() {
-numericsort()
+fl_numericsort()
 ; return 0; }
 EOF
 if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -1664,7 +1664,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lasound  $LIBS"
+LIBS="-lasound -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1670 "configure"
 #include "confdefs.h"
--- alsamixergui-0.9.0rc1-2/src/alsamixer.cxx.BAD	2006-01-16 12:41:54.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/src/alsamixer.cxx	2006-01-16 12:45:44.000000000 -0600
@@ -653,8 +653,8 @@
     if (vleft >= 0 && vright >= 0) {
       if (joined) {
 #ifdef ALSAMIXER_GUI
-	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
-	snd_mixer_selem_channel_id_t(int(chn)++))
+	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST;
+	snd_mixer_selem_channel_id_t(int(chn)+1))
 #else
 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
 #endif


--- NEW FILE alsamixergui.desktop ---
[Desktop Entry]
Name=ALSA Mixer
Comment=GUI version of alsamixer
Exec=alsamixergui
Icon=alsamixergui.png
Categories=Application;AudioVideo;X-Fedora;
Terminal=false
Type=Application
Encoding=UTF-8


--- NEW FILE alsamixergui.spec ---
Name:		alsamixergui
Summary: 	GUI mixer for ALSA sound devices
Version:	0.9.0
Release:	0.2.rc1%{?dist}
License:	BSD-ish
Group:		Applications/System
Source0:	ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/%{name}-%{version}rc1-2.tar.gz
Source1:	alsamixergui.desktop
Source2:	alsamixergui.png
URL:		ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fltk-devel, libstdc++-devel
BuildRequires:	alsa-lib-devel, desktop-file-utils
Patch0:		alsamixergui-modernfix.patch

%description
alsamixergui is a FLTK based frontend for alsamixer. It is written
directly on top of the alsamixer source, leaving the original source
intact, only adding a couple of ifdefs, and some calls to the gui
part, so it provides exactly the same functionality, but with a
graphical userinterface.

%prep
%setup -q -n %{name}-%{version}rc1-2
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor fedora                            \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS COPYING ChangeLog
%{_bindir}/alsamixergui
%{_datadir}/applications/fedora-alsamixergui.desktop
%{_datadir}/pixmaps/alsamixergui.png

%changelog
* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.2.rc1
- add desktop entry

* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.1.rc1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 04:33:26 -0000	1.1
+++ .cvsignore	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+alsamixergui-0.9.0rc1-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 04:33:26 -0000	1.1
+++ sources	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+24b74dda2cf77c313c6cba9b062c8feb  alsamixergui-0.9.0rc1-2.tar.gz