File project.diff of Package makemkv - j0ke.net Open Build Service

File project.diff of Package makemkv (Revision 5beae724f0ba00f55135fbef0ac9ed3a)

Currently displaying revision 5beae724f0ba00f55135fbef0ac9ed3a, show latest

--- makemkv.changes.orig
+++ makemkv.changes
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
+Mon May 28 17:38:57 UTC 2012 - cs@linux-administrator.com
+
+- update to version 1.7.4 
+
+-------------------------------------------------------------------
 Sun Feb  5 21:28:43 UTC 2012 - cs@linux-administrator.com
 
 - update to version 1.7.1 
 
 -------------------------------------------------------------------
+>>>>>>> ./makemkv.changes.rb36f344dc573559ffbc1b5618d81a3bf
 Wed Dec 28 19:47:51 UTC 2011 - cs@linux-administrator.com
 
 - update to version 1.7.0 
--- makemkv.spec.orig
+++ makemkv.spec
@@ -6,7 +6,7 @@
 # norootforbuild
 
 Name:            makemkv
-Version:	1.7.1
+Version:	1.7.4
 Release:	1
 Summary:	One-click video converter
 Group:		Multimedia
@@ -18,7 +18,6 @@ BuildRequires:	-brp-check-suse
 Source0:	makemkv_v%{version}_oss.tar.bz2
 Source1:	makemkv_v%{version}_bin.tar.bz2
 Source2:	playBluRay.tar.bz2
-Patch0:		makemkv-oss-install.patch
 Patch2:		playBluRay-vlc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
@@ -33,7 +32,6 @@ Authors:
     Name Surname 
 %prep
 %setup -n %{name} -c -T -a 0 -b 1 -b 2
-%patch0
 %patch2
 
 %build
@@ -51,9 +49,9 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_datadir}/MakeMKV
 cd makemkv_v%{version}_oss
-make -f makefile.linux DESTDIR=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} install
+make -f makefile.linux DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} install
 cd ../makemkv_v%{version}_bin
-make -f makefile.linux DESTDIR=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} install
+make -f makefile.linux DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} install
 cd ../playBluRay/
 install -m0755 playBluRay.sh %{buildroot}%{_bindir}/playBluRay
 install -D -m0644 playBluRay-icon.png %{buildroot}%{_datadir}/pixmaps/playbluray.png