From 27dacdce1c11ad21fa9f559bf94a03f3cb58e09d Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Mar 16 2005 12:31:38 +0000
Subject: - update to 1.20

- update .glibc patch
- drop .getopt, .fixman, .gcc3 patches

---

diff --git a/.cvsignore b/.cvsignore
index 3cb54db..5d4266e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 adjtimex-1.13.tar.gz
+adjtimex-1.20.tar.gz
diff --git a/adjtimex-1.13-glibc.patch b/adjtimex-1.13-glibc.patch
index cf897bf..ca467b9 100644
--- a/adjtimex-1.13-glibc.patch
+++ b/adjtimex-1.13-glibc.patch
@@ -1,14 +1,18 @@
---- adjtimex-1.13/adjtimex.c.orig	2002-01-07 02:58:03.000000000 +0100
-+++ adjtimex-1.13/adjtimex.c	2004-02-19 14:18:25.596604396 +0100
-@@ -34,11 +34,7 @@
- #include <unistd.h>
- #include <utmp.h>
+--- adjtimex-1.20/adjtimex.c.glibc	2004-09-19 17:37:29.000000000 +0200
++++ adjtimex-1.20/adjtimex.c	2005-03-16 13:16:02.514052584 +0100
+@@ -35,15 +35,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/rtc.h>
  
 -#ifdef __alpha__
  extern int adjtimex(struct timex *);
 -#else
+-#ifdef __ia64__
+-extern int adjtimex(struct timex *);
+-#else
 -_syscall1(int, adjtimex, struct timex *, txcp)
 -#endif
+-#endif
  int F_print = 0;
  
  #ifndef LOG_PATH
diff --git a/adjtimex.spec b/adjtimex.spec
index c8e3af1..e74bc8e 100644
--- a/adjtimex.spec
+++ b/adjtimex.spec
@@ -1,15 +1,12 @@
 Summary: A utility for adjusting kernel time variables.
 Name: adjtimex
-Version: 1.13
-Release: 16
+Version: 1.20
+Release: 1
 ExclusiveOS: Linux
 License: distributable
 Group: System Environment/Base
 Source: http://ibiblio.org/pub/Linux/system/admin/time/adjtimex-%{version}.tar.gz
-Patch0: adjtimex-1.9-getopt.patch
 Patch1: adjtimex-1.13-glibc.patch 
-Patch2: adjtimex-1.11-fixman.patch
-Patch3: adjtimex-1.13-gcc33.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -22,15 +19,12 @@ adjtimex to view kernel time variables.
 
 %prep
 %setup -q
-%patch0 -p1 -b .getopt
 %patch1 -p1 -b .glibc
-%patch2 -p1 -b .fixman
-%patch3 -p1 -b .gcc33
 
 %build
 export CFLAGS="$RPM_OPTFLAGS"
 %configure
-make
+make CC=gcc
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -49,6 +43,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/adjtimex.8*
 
 %changelog
+* Wed Mar 16 2005 Jindrich Novy <jnovy@redhat.com> 1.20-1
+- update to 1.20
+- update .glibc patch
+- drop .getopt, .fixman, .gcc3 patches
+
 * Fri Mar  4 2005 Jindrich Novy <jnovy@redhat.com> 1.13-16
 - rebuilt with gcc4
 
diff --git a/sources b/sources
index af657b8..47277ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cc7bb2904b5ed3cd04c90665ffcb42c  adjtimex-1.13.tar.gz
+00b56c266e707b8c753dfe1d33745226  adjtimex-1.20.tar.gz