aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-10-16 11:32:58 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-10-16 11:32:58 +0000
commit72f69fb5b30e3a0ba22cabb563971155da5e6f34 (patch)
tree3f5f241ba65541c7a04058217ec2706b6f82454b
parentbf147826cb3f22ba8a46e56a714896de16bc61f6 (diff)
downloadnumlock-72f69fb5b30e3a0ba22cabb563971155da5e6f34.tar
numlock-72f69fb5b30e3a0ba22cabb563971155da5e6f34.tar.gz
numlock-72f69fb5b30e3a0ba22cabb563971155da5e6f34.tar.bz2
numlock-72f69fb5b30e3a0ba22cabb563971155da5e6f34.tar.xz
numlock-72f69fb5b30e3a0ba22cabb563971155da5e6f34.zip
- 6mdk
- don't automatically do "cvs commit" when "make rpm"
-rw-r--r--Makefile2
-rw-r--r--numlock.spec21
2 files changed, 19 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index cb74ac1..1953384 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ install: all
dis:
rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
- cvs commit
+# cvs commit
mkdir -p $(NAME)-$(VERSION)
find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/
find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf
diff --git a/numlock.spec b/numlock.spec
index a315ba4..f3c0318 100644
--- a/numlock.spec
+++ b/numlock.spec
@@ -3,7 +3,7 @@
%define name numlock
%define version 2.0
-%define release 2mdk
+%define release 6mdk
Summary: Numlock key locker
Name: %{name}
@@ -12,10 +12,12 @@ Release: %{release}
Copyright: GPL
Group: System/Configuration/Boot and Init
Source0: %{name}-%{version}.tar.bz2
+BuildRequires: XFree86-devel
BuildRoot: %{_tmppath}/%{name}-buildroot
autoReq: no
Requires: fileutils console-tools glibc
Obsoletes: NumLock
+Provides: NumLock = %{version}-%{release}
%description
NumLock enable to lock the numlock key. Only enable it at boot-time with
@@ -48,10 +50,23 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/profile.d/%{name}.sh
%config(noreplace) /etc/X11/xinit.d/numlock
/usr/X11R6/bin/*
-/usr/X11R6/man/man*/*
-%lang(fr) /usr/X11R6/man/fr/man*/*
+/usr/X11R6/man/man?/*
+/usr/X11R6/man/*/man?/*
%changelog
+* Tue Oct 16 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-6mdk
+- fix obsolete-tag Copyright
+- resync in cvs
+
+* Thu Aug 30 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-5mdk
+- fix provides
+
+* Sat Jul 07 2001 Stefan van der Eijk <stefan@eijk.nu> 2.0-4mdk
+- BuildRequires: XFree86-devel
+
+* Thu Jul 5 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-3mdk
+- rebuild
+
* Thu Mar 29 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-2mdk
- user post and preun service macros