- up to 0.2.7

diff --git a/conman.spec b/conman.spec
index d9424a8f6bc253333a5156da13015a5368bc45be..29e3c7efbc907c7b50d48fa6e165820e16175942 100644 (file)
--- a/conman.spec
+++ b/conman.spec
@@ -1,16 +1,17 @@
 Summary:       The Console Manager
 Summary(pl.UTF-8):     Zarządca konsol
 Name:          conman
-Version:       0.1.9.2
+Version:       0.2.7
 Release:       1
 License:       GPL
 Group:         Daemons
-Source0:       http://download.gna.org/conman/0.1.9.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 8e737e64ae3dfac37bd93df38ac0f6cb
+Source0:       https://github.com/dun/conman/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 00316e7340e4741d5d38dcb952fb1e83
 Source1:       %{name}d.init
 Source2:       %{name}d.sysconfig
 Source3:       %{name}.logrotate
-URL:           http://home.gna.org/conman/
+Patch0:                fhs.patch
+URL:           http://dun.github.io/conman/
 BuildRequires: libwrap-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/ldconfig
@@ -31,7 +32,8 @@ Aktualnie obsługuje lokalne urządzenia szeregowe i zdalne serwery
 terminali (poprzez protokół telnet).
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
 
 %build
 %configure \
@@ -52,7 +54,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/conmand
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/conmand
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/conmand
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/examples
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,7 +74,7 @@ fi
 %doc AUTHORS ChangeLog FAQ NEWS
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%{_libdir}/%{name}
+%{_datadir}/%{name}
 %dir %{_var}/log/conman
 %{_mandir}/man*/*
 

diff --git a/fhs.patch b/fhs.patch
new file mode 100644 (file)
index 0000000..76ff9d4
--- /dev/null
+++ b/fhs.patch
@@ -0,0 +1,31 @@
+--- conman-conman-0.2.7/man/conman.conf.5.in~  2011-04-22 02:20:51.000000000 +0200
++++ conman-conman-0.2.7/man/conman.conf.5.in   2016-04-16 20:40:12.253572577 +0200
+@@ -227,7 +227,7 @@
+ An external process-based connection is defined by the "\fIpath\fR
+ \fIargs\fR" format (where \fIpath\fR is the pathname to an executable
+ file/script, and any additional \fIargs\fR are space-delimited); the
+-\fI@prefix@/lib/@PROJECT@/exec\fR directory contains scripts for various
++\fI@prefix@/share/@PROJECT@/exec\fR directory contains scripts for various
+ console types.
+ .br
+ .sp
+--- conman-conman-0.2.7/Makefile.in~   2011-04-22 02:20:51.000000000 +0200
++++ conman-conman-0.2.7/Makefile.in    2016-04-16 20:40:58.335158741 +0200
+@@ -129,13 +129,13 @@
+             && find * -name ".*" -prune -o -type f -print`; do \
+           expr "$$f" : ".*\.exp" && mode=755 || mode=644; \
+           echo $(INSTALL) -m 755 -d \
+-            `dirname $(DESTDIR)$(prefix)/lib/$(PROJECT)/$$f`; \
++            `dirname $(DESTDIR)$(prefix)/share/$(PROJECT)/$$f`; \
+           $(INSTALL) -m 755 -d \
+-            `dirname $(DESTDIR)$(prefix)/lib/$(PROJECT)/$$f`; \
++            `dirname $(DESTDIR)$(prefix)/share/$(PROJECT)/$$f`; \
+           echo $(INSTALL) -m $${mode} \
+-            lib/$$f $(DESTDIR)$(prefix)/lib/$(PROJECT)/$$f; \
++            lib/$$f $(DESTDIR)$(prefix)/share/$(PROJECT)/$$f; \
+           $(INSTALL) -m $${mode} lib/$$f \
+-            $(DESTDIR)$(prefix)/lib/$(PROJECT)/$$f; \
++            $(DESTDIR)$(prefix)/share/$(PROJECT)/$$f; \
+         done
+       @ for d in man1 man5 man8; do \
+           echo $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/$$d; \