rpms/wmix/EL-4 wmix.spec,1.1,1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/wmix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27795

Modified Files:
	wmix.spec 
Log Message:
sync with devel and modify for monolithic X


Index: wmix.spec
===================================================================
RCS file: /cvs/extras/rpms/wmix/EL-4/wmix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmix.spec	2 Sep 2006 08:14:06 -0000	1.1
+++ wmix.spec	28 Dec 2007 17:01:37 -0000	1.2
@@ -1,17 +1,15 @@
 Name:           wmix
 Version:        3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dockapp mixer
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://www.ne.jp/asahi/linux/timecop/#wmix
 Source0:        http://www.ne.jp/asahi/linux/timecop/software/wmix-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11-devel
-BuildRequires:  libXext-devel
-BuildRequireS:  libXpm-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 Dockapp mixer for OSS or ALSA. Allows toggling record source, muting 
@@ -27,7 +25,8 @@
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
+ LDFLAGS="$RPM_OPT_FLAGS -L%{_prefix}/X11R6/%{_lib}"
 
 
 %install
@@ -36,7 +35,7 @@
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 gunzip wmix.1x.gz
 install -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -m644 wmix.1x $RPM_BUILD_ROOT%{_mandir}/man1/wmix.1
+install -p -m644 wmix.1x $RPM_BUILD_ROOT%{_mandir}/man1/wmix.1
 
 
 %clean
@@ -51,6 +50,9 @@
 
 
 %changelog
+* Fri Dec 28 2007 Patrice Dumas <pertusus at free.fr> 3.1-2
+- keep timestamps
+
 * Wed Aug  9 2006 Patrice Dumas <pertusus at free.fr> 3.1-1
 - Initial Release