Fix the spec files for Fedora and SuSE

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@186 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Moritz Bunkus 2010-05-09 21:22:11 +00:00
parent a268471b51
commit 479527964e
3 changed files with 4 additions and 20 deletions

View File

@ -48,7 +48,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

View File

@ -1,14 +0,0 @@
--- libebml-0.7.1/make/linux/Makefile~ 2004-09-01 22:24:12.520218192 +0200
+++ libebml-0.7.1/make/linux/Makefile 2004-09-01 22:25:30.976291056 +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/ebml
# Programs

View File

@ -10,7 +10,7 @@
# neededforbuild gcc-c++ libstdc++-devel
BuildRequires: bzip2 cpp libebml make patch tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
BuildRequires: bzip2 cpp make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
Name: libebml
URL: http://sourceforge.net/projects/ebml
@ -20,7 +20,6 @@ Summary: libary to parse EBML files.
License: LGPL
Group: Development/Libraries/Other
Source: %{name}-%{version}.tar.bz2
Patch: suse-libebml-makefile.diff
Summary: libary to parse EBML files.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
@ -39,16 +38,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