- use rpmcflags and rpmldflags when linking

- fixed install

Changed files:
    openjpeg.spec -> 1.2

diff --git a/openjpeg.spec b/openjpeg.spec
index 54e01334873110559048e3d13f1507552d4a7de7..baa24dc9a2771ae42c15d9bc41ffb9eddcefb47b 100644 (file)
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -10,6 +10,7 @@ Patch0:               %{name}-install.patch
 License:       BSD
 Group:         Libraries
 URL:           http://www.openjpeg.org/
+BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,16 +32,20 @@ developing programs using the OpenJPEG library.
 %prep
 %setup -q -n %{_name}_v%{_ver}
 %patch0 -p1
+sed 's/$(CC) -s/$(CC) $(CFLAGS) $(LDFLAGS)/' -i Makefile
 
 %build
-%{__make} CFLAGS="%{rpmcflags} -fPIC"
+%{__make} \
+       CFLAGS="%{rpmcflags} -fPIC" \
+       LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}
-install lib%{name}/%{name}.h $RPM_BUILD_ROOT%{_includedir}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       INSTALL_LIBDIR=%{_libdir} \
+       INSTALL_INCLUDE=%{_includedir}
+
 cd $RPM_BUILD_ROOT%{_libdir}
 ln -sf libopenjpeg.so.? libopenjpeg.so