rpms/kbd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Don't run ldconfig

Browse Source 
- Don't strip executables
This commit is contained in:
Miloslav Trmac 2005-03-06 20:58:33 +00:00
parent 67ff1c93a6
commit 2524ec4837
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kbd-1.12-nostrip.patch Normal file
View File

@ -0,0 +1,20 @@
--- kbd-1.12/src/Makefile.in.nostrip 2005-03-06 21:51:58.185047112 +0100
+++ kbd-1.12/src/Makefile.in 2005-03-06 21:52:19.791762392 +0100
@@ -72,14 +72,14 @@
install: all
install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)
- install -s -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
-# install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
+ install -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
+# install -m 0755 $(setowner) $(MISC) $(BINDIR)
install -c -m 0755 $(setowner) $(SHCMDS) $(BINDIR)
for i in psfaddtable psfgettable psfstriptable; do \
rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
done
rm -f $(BINDIR)/loadkeys
- install -s -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
+ install -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
@echo "You may also want to add psf.magic to /usr/lib/magic"

12
kbd.spec
View File

@ -1,7 +1,7 @@
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
Name: kbd Name: kbd
Version: 1.12 Version: 1.12
Release: 6 Release: 7
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@ -18,6 +18,7 @@ Patch2: kbd-1.08-terminal.patch
Patch3: kbd-1.08-rukbd.patch Patch3: kbd-1.08-rukbd.patch
Patch4: kbd-1.12-setfont-man.patch Patch4: kbd-1.12-setfont-man.patch
Patch5: kbd-1.12-Meta_utf8.patch Patch5: kbd-1.12-Meta_utf8.patch
Patch6: kbd-1.12-nostrip.patch
Obsoletes: console-tools Obsoletes: console-tools
Provides: console-tools Provides: console-tools
Conflicts: util-linux < 2.11r-9 Conflicts: util-linux < 2.11r-9
@ -38,6 +39,7 @@ fonts, the virtual terminals and font files.
%patch3 -p1 %patch3 -p1
%patch4 -p1 -b .man %patch4 -p1 -b .man
%patch5 -p1 -b .Meta_utf8 %patch5 -p1 -b .Meta_utf8
%patch6 -p1 -b .nostrip
# 7-bit maps are obsolete; so are non-euro maps # 7-bit maps are obsolete; so are non-euro maps
pushd data/keymaps/i386 pushd data/keymaps/i386
@ -101,10 +103,6 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
%clean %clean
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%triggerun -- kbd < 1.08-10.2 %triggerun -- kbd < 1.08-10.2
/sbin/chkconfig --del keytable || : /sbin/chkconfig --del keytable || :
@ -120,6 +118,10 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
%config %{_sysconfdir}/pam.d/* %config %{_sysconfdir}/pam.d/*
%changelog %changelog
* Sun Mar 6 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-7
- Don't run ldconfig
- Don't strip executables
* Fri Mar 4 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-6 * Fri Mar 4 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-6
- Rebuild with gcc4 - Rebuild with gcc4