diff --git a/c-icap.spec b/c-icap.spec index ee2f89e..9c24191 100644 --- a/c-icap.spec +++ b/c-icap.spec @@ -76,24 +76,18 @@ Requires: %{name}-libs = %{version}-%{release} %description progs The %{name}-progs package contains several commandline tools for %{name}. - %prep %setup -q -n %{modn}-%{version} - %build %configure \ CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \ --sysconfdir=%{_sysconfdir}/%{name} \ - --enable-shared \ - --enable-static \ - --enable-lib-compat \ --with-perl \ --with-zlib \ --with-bdb \ --with-ldap \ - --enable-large-files -# --enable-ipv6 # net.ipv6.bindv6only not supported + --enable-large-files %{__make} %{?_smp_mflags} @@ -105,20 +99,14 @@ The %{name}-progs package contains several commandline tools for %{name}. %{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates} %{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name} -%{__make} \ - DESTDIR=%{buildroot} \ - install - -%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir} - -%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%{__make} DESTDIR=%{buildroot} install +%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir} +%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +%{__install} -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf %{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service - %{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/%{modn}/contrib - -%{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??} +%{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??} %pre @@ -139,18 +127,14 @@ exit 0 # Always pass %post libs -p /sbin/ldconfig - %preun %systemd_preun c-icap.service - %postun %systemd_postun_with_restart c-icap.service %postun libs -p /sbin/ldconfig - - %files %defattr(-,root,root) %doc AUTHORS COPYING INSTALL README TODO