rpms/am-utils/devel am-utils-6.1.5-UTS_RELEASE.patch, NONE, 1.1 am-utils.init, 1.4, 1.5 am-utils.spec, 1.39, 1.40 am-utils-6.1.1-linuxNfsMountCheck.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 18 21:07:43 UTC 2006
- Previous message (by thread): rpms/frysk/devel .cvsignore,1.42,1.43 sources,1.42,1.43
- Next message (by thread): rpms/am-utils/FC-6 am-utils-6.1.5-UTS_RELEASE.patch, NONE, 1.1 am-utils.init, 1.4, 1.5 am-utils.spec, 1.39, 1.40 am-utils-6.1.1-linuxNfsMountCheck.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kzak
Update of /cvs/dist/rpms/am-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23137
Modified Files:
am-utils.init am-utils.spec
Added Files:
am-utils-6.1.5-UTS_RELEASE.patch
Removed Files:
am-utils-6.1.1-linuxNfsMountCheck.patch
Log Message:
* Mon Dec 18 2006 Karel Zak <kzak at redhat.com> 5:6.1.5-5
- fix #219437 - amd: stopping service will pop up an error dialog in
system-config-services app.
- fix build (m4 stuff) of the package (UTS_RELEASE macro has been removed
from the latest kernel-headers)
- Resolves: rhbz#219437
am-utils-6.1.5-UTS_RELEASE.patch:
linux_headers.m4 | 7 +++++++
1 files changed, 7 insertions(+)
--- NEW FILE am-utils-6.1.5-UTS_RELEASE.patch ---
--- am-utils-6.1.5/m4/macros/linux_headers.m4.kzak 2005-02-19 22:38:58.000000000 +0100
+++ am-utils-6.1.5/m4/macros/linux_headers.m4 2006-12-18 21:28:04.000000000 +0100
@@ -14,7 +14,14 @@
],
[
if (argc > 1)
+#ifdef UTS_RELEASE
printf("%s", UTS_RELEASE);
+#else
+# define AMU_MA(a) ((a) >> 16)
+# define AMU_MI(a) (((a) & 0xffff) >> 8)
+# define AMU_PL(a) ((a) & 0xff)
+ printf("%d.%d.%d", AMU_MA(LINUX_VERSION_CODE), AMU_MI(LINUX_VERSION_CODE), AMU_PL(LINUX_VERSION_CODE));
+#endif
],
[ host_header_version=$value ],
[ echo
Index: am-utils.init
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- am-utils.init 5 Oct 2005 16:26:58 -0000 1.4
+++ am-utils.init 18 Dec 2006 21:07:41 -0000 1.5
@@ -46,13 +46,12 @@
while [ $i != $maxcount ]; do
# run amq
/usr/sbin/amq > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL != 0 ]
+ if [ $? != 0 ]
then
# amq failed to run (because amd is dead)
rm -f /var/lock/subsys/amd /var/run/amd.pid
echo
- return $RETVAL
+ return 0
fi
sleep $delay
i=`expr $i + 1`
@@ -60,7 +59,7 @@
failure $"amd shutdown"
echo
echo "amd is still up"
- return $RETVAL
+ return 1
}
# See how we were called.
Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- am-utils.spec 24 Aug 2006 14:08:49 -0000 1.39
+++ am-utils.spec 18 Dec 2006 21:07:41 -0000 1.40
@@ -1,7 +1,7 @@
Summary: Automount utilities including an updated version of Amd.
Name: am-utils
Version: 6.1.5
-Release: 4
+Release: 5
License: BSD
Epoch: 5
Group: System Environment/Daemons
@@ -21,6 +21,8 @@
Patch1: am-utils-6.1.5-rmtab-temp.patch
# 202180 - amd service doesn't work
Patch2: am-utils-6.1.5-nfs-version.patch
+# UTS_RELEASE macro has been removed from the latest kernel
+Patch3: am-utils-6.1.5-UTS_RELEASE.patch
# We need to filter out some perl requirements for now.
%define _use_internal_dependency_generator 0
@@ -42,12 +44,14 @@
%patch1 -p1
%patch2 -p1
+%patch3 -p1
find_requires=%{old_find_requires}
echo "$find_requires | grep -v lostaltmail.conf" > find-requires
chmod +x find-requires
%build
+./bootstrap
%configure \
--enable-shared \
--enable-am-cflags="$RPM_OPT_FLAGS -DHAVE_LINUX_NFS_MOUNT_H" \
@@ -136,6 +140,12 @@
%{_libdir}/libamu.so*
%changelog
+* Mon Dec 18 2006 Karel Zak <kzak at redhat.com> 5:6.1.5-5
+- fix #219437 - amd: stopping service will pop up an error dialog in
+ system-config-services app.
+- fix build (m4 stuff) of the package (UTS_RELEASE macro has been removed
+ from the latest kernel-headers)
+
* Tue Aug 24 2006 Karel Zak <kzak at redhat.com> 5:6.1.5-4
- fix #203193 - tmpfile usage
- fix #202180 - amd service doesn't work
--- am-utils-6.1.1-linuxNfsMountCheck.patch DELETED ---
- Previous message (by thread): rpms/frysk/devel .cvsignore,1.42,1.43 sources,1.42,1.43
- Next message (by thread): rpms/am-utils/FC-6 am-utils-6.1.5-UTS_RELEASE.patch, NONE, 1.1 am-utils.init, 1.4, 1.5 am-utils.spec, 1.39, 1.40 am-utils-6.1.1-linuxNfsMountCheck.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list