diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 165aad2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmix
-# $Id$
-NAME := wmix
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/wmix.spec b/wmix.spec
index c78d394..3428b19 100644
--- a/wmix.spec
+++ b/wmix.spec
@@ -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 @@ configuration file to control some of the features.
 
 
 %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 @@ install -d -m755 $RPM_BUILD_ROOT%{_bindir}
 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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 28 2007 Patrice Dumas <pertusus@free.fr> 3.1-2
+- keep timestamps
+
 * Wed Aug  9 2006 Patrice Dumas <pertusus@free.fr> 3.1-1
 - Initial Release