rpms/fltk/devel fltk.spec,1.23,1.24

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Dec 13 18:38:04 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24314

Modified Files:
	fltk.spec 
Log Message:
* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-8.r5555
- more 64bit hackage to workaround broken Makefile logic (#219348)



Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fltk.spec	13 Dec 2006 15:45:05 -0000	1.23
+++ fltk.spec	13 Dec 2006 18:37:34 -0000	1.24
@@ -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 @@
 
 %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 @@
 
 
 %changelog
+* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-8.r5555
+- more 64bit hackage to workaround broken Makefile logic (#219348)
+
 * Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 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)




More information about the fedora-extras-commits mailing list