已关闭
cleanup spec #59
Funda Wang创建于 6月23日关闭于 5 天前
cleanup spec #59
已关闭
从已删除 :master合入到src-openeuler/kbdmaster
共 1 个文件变更+8-22
| @@ -2,9 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | Name: kbd | 3 | Name: kbd |
| 4 | Version: 2.6.1 | 4 | Version: 2.6.1 |
| 5 | -Release: 2 | 5 | +Release: 3 |
| 6 | Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) | 6 | Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) |
| 7 | -License: GPLv2+ | 7 | +License: GPL-2.0-or-later |
| 8 | URL: https://www.kbd-project.org/ | 8 | URL: https://www.kbd-project.org/ |
| 9 | 9 | ||
| 10 | Source0: https://mirrors.edge.kernel.org/pub/linux/utils/kbd/%{name}-%{version}.tar.xz | 10 | Source0: https://mirrors.edge.kernel.org/pub/linux/utils/kbd/%{name}-%{version}.tar.xz |
| @@ -54,16 +54,9 @@ But %{name}-legacy can do nothing without %{name}. | |||
| 54 | %package_help | 54 | %package_help |
| 55 | 55 | ||
| 56 | %prep | 56 | %prep |
| 57 | -%setup -q -a 1 -a 2 | 57 | +%autosetup -p1 -a 1 -a 2 |
| 58 | cp -fp %{SOURCE3} . | 58 | cp -fp %{SOURCE3} . |
| 59 | cp -fp %{SOURCE6} . | 59 | cp -fp %{SOURCE6} . |
| 60 | -%patch0 -p1 -b .keycodes-man | ||
| 61 | -%patch1 -p1 -b .sparc | ||
| 62 | -%patch2 -p1 -b .unicode_start | ||
| 63 | -%patch3 -p1 -b .sg-decimal-separator | ||
| 64 | -%patch4 -p1 -b .loadkeys-search-path | ||
| 65 | -%patch5 -p1 -b .unicode-start-font | ||
| 66 | -%patch6 -p1 -b .covscan-fixes.patch | ||
| 67 | aclocal | 60 | aclocal |
| 68 | autoconf | 61 | autoconf |
| 69 | 62 | ||
| @@ -142,34 +135,27 @@ fi | |||
| 142 | %check | 135 | %check |
| 143 | make check | 136 | make check |
| 144 | 137 | ||
| 145 | -%files | 138 | +%files -f %{name}.lang |
| 146 | -%defattr(-,root,root) | ||
| 147 | %license COPYING | 139 | %license COPYING |
| 148 | %doc AUTHORS | 140 | %doc AUTHORS |
| 149 | -%{_datadir}/locale/* | ||
| 150 | %{_bindir}/* | 141 | %{_bindir}/* |
| 151 | %config(noreplace) %{_sysconfdir}/pam.d/vlock | 142 | %config(noreplace) %{_sysconfdir}/pam.d/vlock |
| 152 | -# library for tests | ||
| 153 | -%exclude %{_libdir}/libtswrap* | ||
| 154 | -%exclude %{_prefix}/lib/debug/%{_libdir}/libtswrap* | ||
| 155 | 143 | ||
| 156 | %files misc | 144 | %files misc |
| 157 | -%defattr(-,root,root) | ||
| 158 | %{kbd_datadir} | 145 | %{kbd_datadir} |
| 159 | %exclude %{kbd_datadir}/keymaps/legacy | 146 | %exclude %{kbd_datadir}/keymaps/legacy |
| 160 | 147 | ||
| 161 | %files legacy | 148 | %files legacy |
| 162 | -%defattr(-,root,root) | ||
| 163 | %{kbd_datadir}/keymaps/legacy | 149 | %{kbd_datadir}/keymaps/legacy |
| 164 | 150 | ||
| 165 | %files help | 151 | %files help |
| 166 | -%defattr(-,root,root) | ||
| 167 | %doc ChangeLog README docs/doc/%{name}.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/* | 152 | %doc ChangeLog README docs/doc/%{name}.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/* |
| 168 | -%{_mandir}/man1/*.1.gz | 153 | +%{_mandir}/man?/* |
| 169 | -%{_mandir}/man5/keymaps.5.gz | ||
| 170 | -%{_mandir}/man8/*.8.gz | ||
| 171 | 154 | ||
| 172 | %changelog | 155 | %changelog |
| 156 | +* Tue Jun 23 2026 Funda Wang <fundawang@yeah.net> - 2.6.1-3 | ||
| 157 | +- cleanup spec | ||
| 158 | + | ||
| 173 | * Thu May 30 2024 zhangpan <zhangpan103@h-partners.com> - 2.6.1-2 | 159 | * Thu May 30 2024 zhangpan <zhangpan103@h-partners.com> - 2.6.1-2 |
| 174 | - resolve gzip time eliminate differences | 160 | - resolve gzip time eliminate differences |
| 175 | 161 | ||