#2 Packaging Guidelines fixes
Opened a year ago by carlwgeorge. Modified a year ago
rpms/ carlwgeorge/keepalived packaging-guidelines-fixes  into  master

file modified
+14 -12

@@ -25,10 +25,12 @@ 

  %endif

  BuildRequires: gcc

  BuildRequires: systemd-units

- BuildRequires: openssl-devel

- BuildRequires: libnl3-devel

- BuildRequires: ipset-devel

- BuildRequires: iptables-devel

+ BuildRequires: pkgconfig(openssl)

+ BuildRequires: pkgconfig(libnl-3.0)

+ BuildRequires: pkgconfig(libnl-genl-3.0)

+ BuildRequires: pkgconfig(libipset)

+ BuildRequires: pkgconfig(libiptc)

+ BuildRequires: pkgconfig(xtables)

  BuildRequires: libnfnetlink-devel

  

  %description

@@ -56,14 +58,13 @@ 

      %{?with_snmp:--enable-snmp --enable-snmp-rfc} \

      %{?with_sha1:--enable-sha1} \

      --with-init=systemd

- %{__make} %{?_smp_mflags} STRIP=/bin/true

+ %make_build STRIP=/bin/true

  

  %install

- rm -rf %{buildroot}

- make install DESTDIR=%{buildroot}

+ %make_install

  rm -rf %{buildroot}%{_initrddir}/

  rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/

- %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service

+ install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service

  mkdir -p %{buildroot}%{_libexecdir}/keepalived

  

  %post

@@ -76,10 +77,11 @@ 

  %systemd_postun_with_restart keepalived.service

  

  %files

- %attr(0755,root,root) %{_sbindir}/keepalived

- %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/keepalived

- %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/keepalived/keepalived.conf

- %doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO

+ %license COPYING

+ %{_sbindir}/keepalived

+ %config(noreplace) %{_sysconfdir}/sysconfig/keepalived

+ %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf

+ %doc AUTHOR ChangeLog CONTRIBUTORS README TODO

  %doc doc/keepalived.conf.SYNOPSIS doc/samples/keepalived.conf.*

  %dir %{_sysconfdir}/keepalived/

  %dir %{_libexecdir}/keepalived/

This pull request brings the spec file in line with the current packaging guidelines. Justification for each change is in the commit messages. There is no effective change to the RPMs, so a rebuild is not necessary.

1 new commit added

  • Mark license appropriately
a year ago