rpms/chrony/devel .cvsignore, 1.3, 1.4 chrony.spec, 1.6, 1.7 sources, 1.3, 1.4 chrony-1.23-cap.patch, 1.1, NONE chrony-1.23-editline.patch, 1.1, NONE chrony-1.23-gethost.patch, 1.1, NONE chrony-1.23-ppc.patch, 1.1, NONE chrony-1.23-res.patch, 1.1, NONE chrony-1.23-s390.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/chrony/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20470

Modified Files:
	.cvsignore chrony.spec sources 
Removed Files:
	chrony-1.23-cap.patch chrony-1.23-editline.patch 
	chrony-1.23-gethost.patch chrony-1.23-ppc.patch 
	chrony-1.23-res.patch chrony-1.23-s390.patch 
Log Message:
- update to 1.24-pre1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 12:58:34 -0000	1.3
+++ .cvsignore	15 Dec 2009 16:29:31 -0000	1.4
@@ -1,3 +1 @@
-chrony-1.23.tar.gz
-getdate.y
-chrony-1.23-gitbe42b4.patch
+chrony-1.24-pre1.tar.gz


Index: chrony.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/chrony.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chrony.spec	24 Jul 2009 18:57:37 -0000	1.6
+++ chrony.spec	15 Dec 2009 16:29:32 -0000	1.7
@@ -1,26 +1,18 @@
+%define prerelease -pre1
 Name:           chrony
-Version:        1.23
-Release:        7.20081106gitbe42b4%{?dist}
+Version:        1.24
+Release:        0.1.pre1%{?dist}
 Summary:        An NTP client/server
 
 Group:          System Environment/Daemons
 License:        GPLv2
-URL:            http://chrony.sunsite.dk
-Source0:        http://chrony.sunsite.dk/download/chrony-%{version}.tar.gz
+URL:            http://chrony.tuxfamily.org
+Source0:        http://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}.tar.gz
 Source1:        chrony.conf
 Source2:        chrony.keys
 Source3:        chronyd.sysconfig
 Source4:        chronyd.init
 Source5:        chrony.logrotate
-# taken from GNU tar-1.13 
-Source6:        getdate.y
-Patch1:         chrony-1.23-gitbe42b4.patch
-Patch2:         chrony-1.23-ppc.patch
-Patch3:         chrony-1.23-gethost.patch
-Patch4:         chrony-1.23-res.patch
-Patch5:         chrony-1.23-cap.patch
-Patch6:         chrony-1.23-s390.patch
-Patch7:         chrony-1.23-editline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libcap-devel libedit-devel bison texinfo
@@ -37,39 +29,23 @@ systems with dial-up Internet connection
 in permanently connected environments. 
 
 %prep
-%setup -q
-cp -p %{SOURCE6} .
-%patch1 -p1
-%patch2 -p1 -b .ppc
-%patch3 -p1 -b .gethost
-%patch4 -p1 -b .res
-%patch5 -p1 -b .cap
-%patch6 -p1 -b .s390
-%patch7 -p1 -b .editline
+%setup -q -n %{name}-%{version}%{?prerelease}
 
 %build
-bison -o getdate.c getdate.y
-
 export CFLAGS="$RPM_OPT_FLAGS -pie -fpie"
-# configure doesn't support --bindir --sbindir options, install manually
-./configure --enable-linuxcaps --with-editline
-make %{?_smp_mflags} all docs
+%configure --docdir=%{_docdir}
+make %{?_smp_mflags} getdate all docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}
-mkdir -p $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man{1,5,8}}
+make install install-docs DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
 mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig,logrotate.d},%{_initrddir}}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
 
-install -m 755 chronyc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 chronyd $RPM_BUILD_ROOT%{_sbindir}
-install -m 644 -p -t $RPM_BUILD_ROOT%{_infodir} chrony.info*
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man1 chrony*.1
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man5 chrony*.5
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man8 chrony*.8
-
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
 install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
 install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd
@@ -124,6 +100,9 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Tue Dec 15 2009 Miroslav Lichvar <mlichvar at redhat.com> 1.24-0.1.pre1
+- update to 1.24-pre1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-7.20081106gitbe42b4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 12:58:34 -0000	1.3
+++ sources	15 Dec 2009 16:29:32 -0000	1.4
@@ -1,3 +1 @@
-ffce77695e55d8efda19ab0b78309c23  chrony-1.23.tar.gz
-ad8091c4b507f7bde3804b8dc1150c56  getdate.y
-c5f94f3fc4c78546b954e050b8027dc5  chrony-1.23-gitbe42b4.patch
+e1f0d15bc0830f5f6bf80da2d72eb16a  chrony-1.24-pre1.tar.gz


--- chrony-1.23-cap.patch DELETED ---


--- chrony-1.23-editline.patch DELETED ---


--- chrony-1.23-gethost.patch DELETED ---


--- chrony-1.23-ppc.patch DELETED ---


--- chrony-1.23-res.patch DELETED ---


--- chrony-1.23-s390.patch DELETED ---