From: Moritz Bunkus <moritz@bunkus.org>
Date: Sun, 9 May 2010 21:25:45 +0000 (+0000)
Subject: Fix the spec files for Fedora and SuSE
X-Git-Tag: release-1.0.0~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e74403c4b78dee4c849a282c9e5155249c8622b7;p=libmatroska

Fix the spec files for Fedora and SuSE

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@187 a6f86f6d-0131-4f8e-9e7b-e335508773d5
---

diff --git a/make/linux/fedora-core.spec b/make/linux/fedora-core.spec
index be886d0..7683c1d 100644
--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@@ -42,7 +42,7 @@ cd ../..
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 cd make/linux
-make prefix=$RPM_BUILD_ROOT/%{_prefix} install_staticlib install_headers
+make prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
 cd ../..
 
 %clean
diff --git a/make/linux/suse-libmatroska-makefile.diff b/make/linux/suse-libmatroska-makefile.diff
deleted file mode 100644
index 4b59a93..0000000
--- a/make/linux/suse-libmatroska-makefile.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmatroska-0.7.3/make/linux/Makefile~	2004-07-19 18:43:44.000000000 +0200
-+++ libmatroska-0.7.3/make/linux/Makefile	2004-09-01 22:36:35.696238264 +0200
-@@ -14,9 +14,9 @@
- ifeq (BeOS,$(shell uname -s))
- prefix=/boot/home/config
- else
--prefix=/usr/local
-+prefix=$(PREFIX)
- endif
--libdir=$(prefix)/lib
-+libdir=$(LIBDIR)
- includedir=$(prefix)/include/matroska
- 
- # Programs
diff --git a/make/linux/suse.spec b/make/linux/suse.spec
index d5035e6..69cb69e 100644
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@@ -10,7 +10,7 @@
 
 # neededforbuild  gcc-c++ libebml libstdc++-devel
 
-BuildRequires: bzip2 cpp libebml make patch tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
+BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
 
 Name:         libmatroska
 URL:          http://dl.matroska.org/downloads/libmatroska/
@@ -20,7 +20,6 @@ Summary:      library to deal with matroska files.
 License:      LGPL
 Group:        Development/Libraries/Other
 Source:       %{name}-%{version}.tar.bz2
-Patch:        suse-libmatroska-makefile.diff
 Summary:      library to deal with matroska files.
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Prefix:       /usr
@@ -40,16 +39,15 @@ Authors:
 %prep
 rm -rf $RPM_BUILD_ROOT
 %setup
-%patch -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 cd make/linux
-make PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=%{_libdir} staticlib
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} staticlib
 
 %install
 cd make/linux
-make install_staticlib install_headers PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=$RPM_BUILD_ROOT/%{_libdir}
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
 
 %clean
 rm -rf $RPM_BUILD_ROOT