Fixed source paths

.gitignore

@@ -0,0 +1 @@
+*~

minetest.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Minetest
 GenericName=Minetest
-Comment=An InfiniMiner/Minecraft inspired game
+Comment=Multiplayer infinite-world block sandbox
 Exec=minetest
 Icon=minetest-icon
 Terminal=false

minetest.logrotate

@@ -0,0 +1,5 @@
+/var/log/minetest.log {
+    copytruncate
+    notifempty
+    missingok
+}

minetest.rsyslog

@@ -0,0 +1,6 @@
+# Log minetest generated log messages to file
+:programname, isequal, "minetestserver"	/var/log/minetest.log
+     
+# comment out the following line to allow minetest messages through.
+# Doing so means you'll also get minetest messages in /var/log/messages
+& ~

minetest.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Minetest multiplayer server
+After=syslog.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/minetestserver --config /etc/minetest.conf --port 30000 --map-dir /var/lib/minetest
+
+User=minetest
+Group=minetest
+
+[Install]
+WantedBy=multi-user.target

minetest.spec

@@ -1,30 +1,55 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %global gitcommit bc0e5c0
 %global gitname celeron55
 
 Name:		minetest
 Version:	0.3.1
-Release:	1.git%{gitcommit}%{?dist}.R
-Summary:	An InfiniMiner/Minecraft inspired game
+Release:	3.git%{gitcommit}%{?dist}.R
+Summary:	Multiplayer infinite-world block sandbox with survival mode
 
 Group:		Amusements/Games
 License:	GPLv2+
 URL:		http://celeron.55.lt/minetest/		
 
-#		wget https://github.com/celeron55/minetest/tarball/bc0e5c0
-#		wget https://raw.github.com/RussianFedora/minetest/master/minetest.desktop
+# wget https://github.com/celeron55/minetest/tarball/bc0e5c0
+# wget https://raw.github.com/RussianFedora/minetest/master/minetest.desktop
+# wget https://raw.github.com/RussianFedora/minetest/master/minetest.service
+# wget https://raw.github.com/RussianFedora/minetest/master/minetest.rsyslog
+# wget https://raw.github.com/RussianFedora/minetest/master/minetest.logrotate
 Source0:	https://github.com/celeron55/minetest/tarball/%{gitcommit}
 Source1:	%{name}.desktop
-
+Source2:	%{name}.service
+Source3:	%{name}.rsyslog
+Source4:	%{name}.logrotate
 
 BuildRequires:	cmake >= 2.6.0
-BuildRequires:	irrlicht-devel bzip2-devel libpng-devel libjpeg-turbo-devel libXxf86vm mesa-libGL-devel	jthread-devel sqlite-devel gettext-devel
+BuildRequires:	irrlicht-devel
+BuildRequires:	bzip2-devel gettext-devel jthread-devel sqlite-devel
+BuildRequires:	libpng-devel libjpeg-turbo-devel libXxf86vm mesa-libGL-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	systemd-units
 
+Requires:	minetest-server = %{version}-%{release}
 Requires:	hicolor-icon-theme
 
-%description
-An InfiniMiner/Minecraft inspired game
+%description 
+Game of mining, crafting and building in the infinite world of cubic
+blocks with optional hostile creatures. Features both single and the
+network multiplayer mode. There are no in-game sounds yet
+
+%package	server
+Summary:	Minetest multiplayer server
+Group:		Amusements/Games
+
+Requires(pre):		shadow-utils
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+
+
+%description	server
+Minetest multiplayer server. This package does not require X Window System
 
 %prep
 %setup -q -n %{gitname}-%{name}-%{gitcommit}
@@ -40,53 +65,112 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Put icon in the new fdo location
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
-cp %{name}-icon.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+cp -p %{name}-icon.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
 # Add desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
- 
-%find_lang %{name}
 
+# Systemd unit file
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}
+
+# /etc/rsyslog.d/minetest.conf
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/%{name}.conf
+
+# /etc/logrotate.d/minetest
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
+
+# /var/lib/minetest directory for server data files
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name} 
+
+# /etc/minetest.conf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p minetest.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+
+# Move doc directory back to the sources
+mkdir __doc
+mv  $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/* __doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+%pre server
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+    useradd -r -g %{name} -d /var/lib/%{name} -s /sbin/nologin \
+    -c "Minetest multiplayer server" %{name}
+exit 0
+
+%post server
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun server
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
+    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
+fi
+
+%postun server
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_bindir}/%{name}server
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
-%{_docdir}/%{name}
 
+%files server
+%{_bindir}/%{name}server
+%{_unitdir}/%{name}.service
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/rsyslog.d/%{name}.conf
+%attr(0755,minetest,minetest) %dir %{_sharedstatedir}/%{name}
 
-%doc doc/changelog.txt  doc/gpl-2.0.txt  doc/mapformat.txt  doc/protocol.txt
-
+%doc README.txt doc/changelog.txt doc/gpl-2.0.txt doc/mapformat.txt doc/protocol.txt
 
 %changelog
+* Sat Nov 13 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.3.1-3.gitbc0e5c0.R
+- Systemd unit file, rsyslog, user/group and other server-related fixes
+
+* Sat Nov 12 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.3.1-2.gitbc0e5c0.R
+- Fixed doc directories
+- Split package into main and -server parts
+
 * Wed Nov  9 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.3.1-1.gitbc0e5c0.R
-- Update to stable 0.3.1 version.
+- Update to stable 0.3.1 version
 
 * Thu Nov  3 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.3.0-1.gitf65d157.R
-- Update to stable 0.3.0 version.
+- Update to stable 0.3.0 version
 
 * Fri Sep 30 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.2.20110922_2-2.git960009d
-- Desktop file and icon.
+- Desktop file and icon
 
 * Fri Sep 30 2011 Aleksandra Bookwar <alpha@bookwar.info> - 0.2.20110922_2-1.git960009d
-- Basic build of the current stable version.
+- Basic build of the current stable version