F28 cleanupHEADmaster

3 files changed, 17 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f69818
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
index 1e65467..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../common/Makefile
 
diff --git a/cmph.spec b/cmph.spec
index e8edf90..efb3ff1 100644
--- a/cmph.spec
+++ b/cmph.spec
@@ -1,13 +1,11 @@
 Name:          cmph
 Version:       2.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Minimal hash C library
-Group:         System Environment/Libraries
 License:       MPLv1.1 or LGPLv2
 URL:           http://cmph.sourceforge.net/
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
 BuildRequires: check-devel
 
@@ -38,11 +36,7 @@ sed -e 's/-Wall/$CFLAGS/' -i configure.ac
 
 
 %build
-%if 0%{?rhel} == 5
-: Use provided configure in EL5
-%else
 autoreconf -i --force
-%endif
 
 # --enable-cxxmph not used, build broken
 
@@ -62,20 +56,19 @@ rm -f %{buildroot}%{_libdir}/lib%{name}.{a,la}
 make check
 
 
-%post -p /sbin/ldconfig
-
+%if 0%{?fedora} < 28 && 0%{?rhel} < 8
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+%endif
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING LGPL-2 MPL-1.1 README
 %{_libdir}/lib%{name}.so.*
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/%{name}*
 %{_includedir}/chd_ph.h
 %{_libdir}/lib%{name}.so
@@ -83,5 +76,8 @@ make check
 
 
 %changelog
+* Mon Feb 26 2018 Remi Collet <remi@feoraproject.org> - 2.0-2
+- F28 cleanup
+
 * Wed Oct  9 2013 Remi Collet <remi@feoraproject.org> - 2.0-1
 - Initial package