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 be886d0e98ab4db01f7a91e08f00cf16eef53c7e..7683c1db10985051da8a259bc899dd024f9f899c 100644 (file)
--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@@ -42,7 +42,7 @@ cd ../..
 %install\r
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT\r
 cd make/linux\r
-make prefix=$RPM_BUILD_ROOT/%{_prefix} install_staticlib install_headers\r
+make prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers\r
 cd ../..\r
 \r
 %clean\r

diff --git a/make/linux/suse-libmatroska-makefile.diff b/make/linux/suse-libmatroska-makefile.diff
deleted file mode 100644 (file)
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\r
-+++ libmatroska-0.7.3/make/linux/Makefile      2004-09-01 22:36:35.696238264 +0200\r
-@@ -14,9 +14,9 @@\r
- ifeq (BeOS,$(shell uname -s))\r
- prefix=/boot/home/config\r
- else\r
--prefix=/usr/local\r
-+prefix=$(PREFIX)\r
- endif\r
--libdir=$(prefix)/lib\r
-+libdir=$(LIBDIR)\r
- includedir=$(prefix)/include/matroska\r
- \r
- # Programs\r

diff --git a/make/linux/suse.spec b/make/linux/suse.spec
index d5035e6c1ffdb226f6fe5cd0896439c7df1ab3e8..69cb69e19c28d4b2e59e2146d27c825f4c036e28 100644 (file)
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@@ -10,7 +10,7 @@
 \r
 # neededforbuild  gcc-c++ libebml libstdc++-devel\r
 \r
-BuildRequires: bzip2 cpp libebml make patch tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm\r
+BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm\r
 \r
 Name:         libmatroska\r
 URL:          http://dl.matroska.org/downloads/libmatroska/\r
@@ -20,7 +20,6 @@ Summary:      library to deal with matroska files.
 License:      LGPL\r
 Group:        Development/Libraries/Other\r
 Source:       %{name}-%{version}.tar.bz2\r
-Patch:        suse-libmatroska-makefile.diff\r
 Summary:      library to deal with matroska files.\r
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build\r
 Prefix:       /usr\r
@@ -40,16 +39,15 @@ Authors:
 %prep\r
 rm -rf $RPM_BUILD_ROOT\r
 %setup\r
-%patch -p1\r
 \r
 %build\r
 export CFLAGS="$RPM_OPT_FLAGS"\r
 cd make/linux\r
-make PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=%{_libdir} staticlib\r
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} staticlib\r
 \r
 %install\r
 cd make/linux\r
-make install_staticlib install_headers PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=$RPM_BUILD_ROOT/%{_libdir}\r
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers\r
 \r
 %clean\r
 rm -rf $RPM_BUILD_ROOT\r