From d9672d19dcd4c914e766dc20bd48f01243fa52b2347f1564c5874159877ebbf0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 1 Mar 2014 08:46:14 +0000 Subject: [PATCH] - Run spec-cleaner, nothing more than that. OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=11 --- criu.changes | 5 +++++ criu.spec | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/criu.changes b/criu.changes index 7fe89ce..fef0ce5 100644 --- a/criu.changes +++ b/criu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 1 09:39:03 CET 2014 - tiwai@suse.de + +- Run spec-cleaner, nothing more than that. + ------------------------------------------------------------------- Wed Feb 26 17:15:26 CET 2014 - tiwai@suse.de diff --git a/criu.spec b/criu.spec index ec7b3d3..971fa16 100644 --- a/criu.spec +++ b/criu.spec @@ -23,12 +23,12 @@ Summary: Checkpoint/Restore In Userspace Tools License: GPL-2.0 Group: System/Console Url: http://criu.org/ -Requires: logrotate +Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2 BuildRequires: asciidoc BuildRequires: protobuf-c BuildRequires: xmlto BuildRequires: pkgconfig(systemd) -Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2 +Requires: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 @@ -60,24 +60,24 @@ This package contains all necessary include files and libraries needed to develop applications with CRIU library. %prep -%setup -q -n %{name}-%{version} +%setup -q %build -export CFLAGS="%optflags" -make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=/etc/logrotate.d/ +export CFLAGS="%{optflags}" +make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=%{_sysconfdir}/logrotate.d/ %install -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=/etc/logrotate.d/ \ - DESTDIR=$RPM_BUILD_ROOT install +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=%{_sysconfdir}/logrotate.d/ \ + DESTDIR=%{buildroot} install # make rpmlint happy -mv $RPM_BUILD_ROOT/etc/logrotate.d/criu-service \ - $RPM_BUILD_ROOT/etc/logrotate.d/criu +mv %{buildroot}%{_sysconfdir}/logrotate.d/criu-service \ + %{buildroot}%{_sysconfdir}/logrotate.d/criu # for compatiblity -ln -s criu $RPM_BUILD_ROOT%{_sbindir}/crtools -ln -s criu.8 $RPM_BUILD_ROOT%{_mandir}/man8/crtools.8 +ln -s criu %{buildroot}%{_sbindir}/crtools +ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8 # fix up wrong permissions -chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man*/* +chmod 0644 %{buildroot}%{_mandir}/man*/* %pre %service_add_pre criu.service criu.socket @@ -105,7 +105,7 @@ exit 0 %{_sbindir}/* %{_mandir}/man*/* %{_unitdir}/criu.* -/etc/logrotate.d/* +%{_sysconfdir}/logrotate.d/* %files -n libcriu1 %defattr(-,root,root)