From 2f63c1d94ee0b39b783d2750b02f63a94b3587bf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Dec 2006 18:37:34 +0000 Subject: [PATCH] - more 64bit hackage to workaround broken Makefile logic (#219348) --- fltk.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/fltk.spec b/fltk.spec index 887fa6a..45a229c 100644 --- a/fltk.spec +++ b/fltk.spec @@ -5,7 +5,7 @@ Summary: C++ user interface toolkit Name: fltk Version: 1.1.7 -Release: 7.%{snap}%{?dist} +Release: 8.%{snap}%{?dist} License: LGPL with exceptions Group: System Environment/Libraries @@ -94,8 +94,22 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + +# Makefile hack for 64bitness +%if "%{_lib}" != "lib" +mkdir -p $RPM_BUILD_ROOT%{_libdir} +pushd $RPM_BUILD_ROOT%{_libdir}/.. +ln -s %{_lib} lib +popd +%endif + make install install-desktop DESTDIR=$RPM_BUILD_ROOT +# Makefile hack for 64bitness +%if "%{_lib}" != "lib" +rm -f $RPM_BUILD_ROOT%{_libdir}/../lib +%endif + desktop-file-install --vendor=%{name} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category="Development" \ @@ -180,6 +194,9 @@ update-desktop-database >& /dev/null ||: %changelog +* Wed Dec 13 2006 Rex Dieter 1.1.7-8.r5555 +- more 64bit hackage to workaround broken Makefile logic (#219348) + * Wed Dec 13 2006 Rex Dieter 1.1.7-7.r5555 - fltk-1.1.x-r5555 snapshot, for 64bit issues (#219348) - restore static libs (they're tightly coupled with fltk-config)