diff --git a/.cvsignore b/.cvsignore index 20cea32..f054503 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -adjtimex-1.21.tar.gz +adjtimex_1.24.orig.tar.gz diff --git a/adjtimex-1.13-glibc.patch b/adjtimex-1.13-glibc.patch deleted file mode 100644 index ca467b9..0000000 --- a/adjtimex-1.13-glibc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 - #include - --#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-1.21-optstring.patch b/adjtimex-1.21-optstring.patch deleted file mode 100644 index d579603..0000000 --- a/adjtimex-1.21-optstring.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- adjtimex-1.21/adjtimex.c.optstring 2006-10-16 13:09:45.000000000 +0200 -+++ adjtimex-1.21/adjtimex.c 2006-10-16 13:13:26.000000000 +0200 -@@ -270,7 +270,7 @@ - txc.modes = 0; - - while((c = getopt_long_only(argc, argv, -- "a::c::l::e:f:h:i:m:o:prPPsPS:RT:t:uvVw", -+ "a::c::l::e:f:h:i:m:o:pr::s:S:RT:t:uvVw", - longopt, NULL)) != -1) - { - switch(c) diff --git a/adjtimex.spec b/adjtimex.spec index 9c5cc02..5a75ff4 100644 --- a/adjtimex.spec +++ b/adjtimex.spec @@ -1,13 +1,11 @@ Summary: A utility for adjusting kernel time variables Name: adjtimex -Version: 1.21 -Release: 4%{?dist} +Version: 1.24 +Release: 1%{?dist} ExclusiveOS: Linux License: GPLv2+ Group: System Environment/Base -Source: http://ibiblio.org/pub/Linux/system/admin/time/adjtimex-%{version}.tar.gz -Patch1: adjtimex-1.13-glibc.patch -Patch2: adjtimex-1.21-optstring.patch +Source: http://ftp.debian.org/debian/pool/main/a/adjtimex/%{name}_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -20,12 +18,10 @@ adjtimex to view kernel time variables. %prep %setup -q -%patch1 -p1 -b .glibc -%patch2 -p1 -b .optstring %build %configure -make +make %{?_smp_mflags} VERSION=%{version} %install rm -rf ${RPM_BUILD_ROOT} @@ -39,11 +35,14 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc README COPYING COPYRIGHT +%doc README COPYING COPYRIGHT ChangeLog /sbin/adjtimex %{_mandir}/man8/adjtimex.8* %changelog +* Wed May 21 2008 Miroslav Lichvar 1.24-1 +- update to 1.24 + * Tue Feb 19 2008 Fedora Release Engineering - 1.21-4 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 314ee51..9ee2c7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9888b54f418d7cc120fd3a4222f01c9c adjtimex-1.21.tar.gz +481fdcf47c685989654aa207687b49db adjtimex_1.24.orig.tar.gz