[module-init-tools] Merge review fixes.

Jon Ciesla limb at fedoraproject.org
Thu Feb 7 18:19:08 UTC 2013


commit 75d7178297a46a9caeb4c9d028df24629cd42b42
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Feb 7 12:16:14 2013 -0600

    Merge review fixes.

 module-init-tools.spec |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/module-init-tools.spec b/module-init-tools.spec
index 929387c..96cd505 100644
--- a/module-init-tools.spec
+++ b/module-init-tools.spec
@@ -1,21 +1,21 @@
 %define pre_release none
 
-Summary: Kernel module management utilities.
+Summary: Kernel module management utilities
 Name: module-init-tools
 Version: 3.16
-# Release: 0.1.%{pre_release}%{?dist}
-Release: 6%{?dist}
+# Release: 0.1.%%{pre_release}%%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
-#Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
-#Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
+URL: http://www.kernel.org/
+#Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%%{version}.tar.bz2
+#Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%%{version}.tar.bz2.sign
 Source: module-init-tools-%{version}.tar.gz
 Source1: module-init-tools-%{version}.tar.gz.sign
 Source2: weak-modules
 Source3: depmod-dist.conf
 Patch0: module-init-tools-fix-nfs-local.patch
 Exclusiveos: Linux
-Obsoletes: modutils-devel modutils
 Requires(pre): /sbin/chkconfig sh-utils
 Provides: modutils = %{version}
 BuildRequires: docbook-utils glibc-static zlib-devel zlib-static
@@ -28,7 +28,7 @@ as other module management programs. Device drivers and filesystems
 are two examples of loaded and unloaded modules.
 
 %prep
-#setup -q -n module-init-tools-%{version}%{pre_release}
+#setup -q -n module-init-tools-%%{version}%%{pre_release}
 %setup -q -n module-init-tools-%{version}
 
 %patch0 -p1 -b .nfs
@@ -83,6 +83,9 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Thu Feb 07 2013 Jon Ciesla <limburgher at gmail.com> - 3.16-7
+- Merge review fixes, BZ 226157.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -616,7 +619,7 @@ fi
 - update to 2.4.0
 - tweak irda aliases
 - remove vixie-cron dependency (it's not *required*)
-- add missing %build (where did that go?)
+- add missing %%build (where did that go?)
 
 * Sun Jan  7 2001 Bernhard Rosenkraenzer <bero at redhat.com>
 - 2.4.0
@@ -658,7 +661,7 @@ fi
 - sparc64 ELF hacks.
 
 * Mon Aug 21 2000 Michael K. Johnson <johnsonm at redhat.com>
-- Use %{_mandir} for removing kerneld-related man pages.
+- Use %%{_mandir} for removing kerneld-related man pages.
 
 * Wed Aug  9 2000 Jakub Jelinek <jakub at redhat.com>
 - fix build on SPARC
@@ -697,7 +700,7 @@ fi
 - fix build with glibc 2.2
 
 * Tue May 09 2000 Doug Ledford <dledford at redhat.com>
-- Correct %description to reflect that we don't build kerneld by default
+- Correct %%description to reflect that we don't build kerneld by default
 
 * Fri Apr 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - 2.3.11
@@ -798,7 +801,7 @@ fi
 - util/sys_cm.c: fix create_module syscall (signed return on sparc too)
 
 * Wed Jul 15 1998 Jeff Johnson <jbj at redhat.com>
-- correct %postun typos
+- correct %%postun typos
 
 * Fri May 01 1998 Erik Troan <ewt at redhat.com>
 - added /lib/modules/preferred to search path


More information about the scm-commits mailing list