rename fix for debian/fedora

man/movian.1

@@ -0,0 +1,25 @@
+.TH "Movian" 1
+.SH NAME
+movian \ - OpenGL based mediaplayer
+.SH SYNOPSIS
+.B movian
+[\fIOPTIONS\fR]
+.SH DESCRIPTION
+.B Movian
+is an OpenGL based mediaplayer.
+All setup and configuration of Movian is done from within the program itself.
+.SH OPTIONS
+All arguments are optional.
+.TP
+\fB\-s \fR\fIpath\fR
+Store settings in \fR\fIpath\fR. Default is to store settings in
+$HOME/.hts/movian
+.SH "AUTHOR"
+.B Movian
+and this man page is maintained by Andreas Oeman
+.PP
+(andreas a lonelycoder d com)
+.PP
+You may also visit #hts at irc.freenode.net
+.SH "SEE ALSO"
+.BR https://movian.tv

src/arch/linux/linux.mk

@@ -38,32 +38,38 @@ DVDCSS_CFLAGS = -DHAVE_LINUX_DVD_STRUCT -DDVD_STRUCT_IN_LINUX_CDROM_H -D_LARGEFI
 # Install
 #
 
+ifeq ("$(wildcard $(/etc/redhat-release))","");
+     appname := movian
+else
+     appname  := showtime
+endif 
 
-MAN = man/showtime.1
-DESKTOP = support/gnome/showtime.desktop
-ICON = support/gnome/showtime.svg
+
+MAN = man/${appname}.1
+DESKTOP = support/gnome/${appname}.desktop
+ICON = support/gnome/${appname}.svg
 
 INSTDESKTOP= ${DESTDIR}$(prefix)/share/applications
 INSTICON= ${DESTDIR}$(prefix)/share/icons/hicolor/scalable/apps
 
 
 install: ${PROG}.datadir ${MAN} ${DESKTOP} ${ICON}
-	install -D ${PROG}.datadir ${bindir}/showtime
-	install -D ${MAN} ${mandir}/showtime.1
-
-	install -D ${DESKTOP} ${INSTDESKTOP}/showtime.desktop
-	install -D ${ICON} ${INSTICON}/showtime.svg
+	install -D ${PROG}.datadir ${bindir}/${appname}
+	install -D ${MAN} ${mandir}/${appname}.1
+	install -D ${DESKTOP} ${INSTDESKTOP}/${appname}.desktop
+	install -D ${ICON} ${INSTICON}/${appname}.svg
 
 	for bundle in ${BUNDLES}; do \
 		mkdir -p ${datadir}/$$bundle ;\
 		cp -r $$bundle/*  ${datadir}/$$bundle ;\
 	done
 
+#	gtk-update-icon-cache $(prefix)/share/icons/hicolor/
+
 uninstall:
-	rm -f ${bindir}/showtime
-	rm -f ${mandir}/showtime.1
-	rm -f ${INSTDESKTOP}/showtime.desktop
-	rm -f ${INSTICON}/showtime.svg
+	rm -f ${bindir}/${appname}
+	rm -f ${mandir}/${appname}.1
+	rm -f ${INSTDESKTOP}/${appname}.desktop
+	rm -f ${INSTICON}/${appname}.svg
 
-#	gtk-update-icon-cache $(prefix)/share/icons/hicolor/
 

support/fedora/README.Fedora25

@@ -0,0 +1,97 @@
+
+How to compile, install and make rpm packages of showtime in Fedora 25
+
+This document is written so you can start with a clean install of Fedora 25 Workstation 
+
+
+###############################################################################
+
+Section 1 - RPMFusion Repositories (3rd party repository) this might not be needed, but nice to have.
+Section 2 - Install Development packages
+Section 3 - Movian Source
+Section 4 - RPM (only if you need to make an rpm. You can install from source in Section 3 if you like.)
+
+
+###############################################################################
+
+
+
+###############################################################################
+## Section 1 - RPMFusion Repositories
+###############################################################################
+
+
+Setup your Fedora to use RPMfusion as 3'rd party repositories by web or command line
+
+Browse to rpmfusion.org and goto the configuration page and install both the free and nonfree libraries that is correct for this version or do it command line stile.
+
+root@computer ~]# su -c 'dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm'
+
+
+###############################################################################
+## Section 2 - Install Development packages
+###############################################################################
+
+
+Become root in a shell (su -) and add theese groups to make the computer a basic development workstation
+
+root@computer ~]# dnf groupinstall "Development Tools" "Development Libraries"
+
+Next add the development packages that Movian depends on. This will trigger some dependencies.
+
+root@computer ~]# dnf install yasm alsa-lib-devel pulseaudio-libs-devel libXScrnSaver-devel libXv-devel avahi-devel libvdpau-devel mesa-libGLw-devel mesa-libGLU-devel librtmp-devel
+
+
+###############################################################################
+## Section 3 - Showtime Source
+###############################################################################
+
+
+//as user
+
+user@computer ~]$ git clone git://github.com/andoma/movian
+
+//if you intend to make an rpm package stop here and go to the next section. Do not run ./configure in the folder.. (will fail to build later because folder will be renamed)
+
+go to movian folder
+user@computer ~]$ cd movian
+
+If you just want to compile and install do on 64bit install of fedora
+user@computer movian]$ ./configure --prefix=/usr --datadir="\${prefix}/share/movian" --libdir="\${prefix}/lib64/movian" --release
+
+If you just want to compile and install do on 32bit install of fedora
+user@computer movian]$ ./configure --prefix=/usr --datadir="\${prefix}/share/movian" --libdir="\${prefix}/lib/movian" --release
+
+user@computer movian]$ make -j4   // use make -j(number of cpu threads to use) to compile the source
+
+//as superuser (root) do the system install
+
+root@computer movian]# make install
+
+
+###############################################################################
+## Section 4 - RPM
+###############################################################################
+
+
+add rpmdevtools to create rpm packages 
+root@computer ~]# dnf install rpmdevtools
+
+Then in you home folder as user (not as root) run
+user@computer ~]$ rpmdev-setuptree
+
+copy movian.spec from the $HOME/showtime/support/fedora folder into $HOME/rpmbuild/SPEC directory
+
+Check the spec file for the version it intends to build and rename the movian folder to movian-x.y.z if x.y.z is the version in the spec file
+
+Add that folder to a bz2 archive.  movian-x.y.z.tar.bz2 (this archive now has the movian folder and all it's subcontents within.
+
+Move the archive to your newly created $home/rpmbuild/SOURCES folder (was created with rpmdev-setuptree)
+
+change directory to $home/rpmbuild/SPEC  and make the rpm files.
+
+user@computer ~]$ rpmbuild -ba movian.spec
+user@computer ~]$ rpmbuild -ba --target i686 movian.spec  //if you are on a 64bit machine and need to make the 32bit rpm
+
+
+root@computer ~]$

support/fedora/movian.spec

@@ -0,0 +1,105 @@
+Name:		movian
+Version:	5.0.1
+Release:	1%{?dist}
+Summary:	Movian is a Linux based media player.
+# movian source manually checked out and put into movian-%{version}.tar.bz2 file
+# within rpmbuild environment
+Group:		Applications/Multimedia
+License:	GPLv3
+URL:		https://movian.tv
+Source0:	$home/rpmbuild/SOURCES/movian-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	yasm
+BuildRequires:	alsa-lib-devel
+BuildRequires:	pulseaudio-libs-devel
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	libXv-devel
+BuildRequires:	avahi-devel
+BuildRequires:	libvdpau-devel
+BuildRequires:	mesa-libGLw-devel
+BuildRequires:	mesa-libGLU-devel
+BuildRequires:	librtmp-devel
+BuildRequires:	polarssl-devel
+BuildRequires:	freetype-devel
+BuildRequires:	desktop-file-utils
+
+Requires:	alsa-lib
+Requires:	pulseaudio-libs
+#Requires:	libXScrnSaver
+#Requires:	libXv
+Requires:	avahi
+#Requires:	libvdpau
+Requires:	mesa-libGLw
+Requires:	mesa-libGLU
+Requires:	librtmp
+#Requires:	polarssl
+#Requires:	freetype
+
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+%description
+OpenGL based Mediaplayer for usage on HTPCs — Listen to Music, watch Photos, play Movies, watch TV, all from within the same application.
+Easy to setup, no configuration files. All configuration is tuned from inside the program itself. 
+
+
+%prep
+%setup -q
+
+%build
+git checkout release/5.0
+
+# for 64bit path
+./configure --release --prefix=/usr --datadir=/usr/share/movian --libdir=/usr/lib64/movian --release
+
+# for 32bit path
+#./configure --release --prefix=/usr --datadir=/usr/share/movian --libdir=/usr/lib/movian --release
+
+
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-validate %{buildroot}/%{_datadir}/applications/movian.desktop
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+scrollkeeper-update -q
+update-desktop-database -q
+chmod 644 /usr/share/man/man1/movian*
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%postun
+scrollkeeper-update -q
+update-desktop-database -q
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE README.markdown
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_mandir}/man1/%{name}.1*
+
+
+
+%changelog
+* Thu  Dec 15 2016 Jonas Karlsson <jonas karlsson at fxdev dot com> 5.0.1-1
+- Update for Fedora 25
+
+

support/gnome/movian.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Movian
+Comment=Movian Media Player
+Comment[sv]=Movian Mediaspelare
+Exec=movian %U
+Icon=movian
+Terminal=false
+Type=Application
+Categories=AudioVideo;Player;
+#StartupNotify=true
+MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
+