rpms/libdockapp/EL-5 dockapp-0.6.1-ppc64.patch, NONE, 1.1 libdockapp.spec, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libdockapp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472/EL-5

Modified Files:
	libdockapp.spec 
Added Files:
	dockapp-0.6.1-ppc64.patch 
Log Message:
sync with devel and adapt to EL

dockapp-0.6.1-ppc64.patch:

--- NEW FILE dockapp-0.6.1-ppc64.patch ---
--- dockapp-0.6.1/ltconfig.ppc64	2005-07-16 13:50:02.000000000 +0200
+++ dockapp-0.6.1/ltconfig	2007-05-24 09:55:55.000000000 +0200
@@ -2002,16 +2002,7 @@ linux-gnu*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   deplibs_check_method=pass_all
-
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
+  dynamic_linker='GNU ld.so'
   ;;
 
 netbsd*)


Index: libdockapp.spec
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/EL-5/libdockapp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdockapp.spec	10 Jan 2007 10:00:26 -0000	1.1
+++ libdockapp.spec	27 Dec 2007 08:19:24 -0000	1.2
@@ -1,8 +1,9 @@
 %define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
 
 Name:           libdockapp
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        DockApp Development Standard Library
 
 Group:          System Environment/Libraries
@@ -11,6 +12,8 @@
 Source0:        http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/libdockapp-%{version}.tar.bz2
 # add prototypes and includes
 Patch0:         libdockapp-0.6.1-stdinc_decl.patch
+# fix ancient libtool bug on ppc64
+Patch1:         dockapp-0.6.1-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXpm-devel libXext-devel libX11-devel
@@ -51,6 +54,7 @@
 %prep
 %setup -q -n dockapp-%{version}
 %patch0 -p1 -b .stdinc_decl
+%patch1 -p1 -b .ppc64
 
 %build
 %configure --disable-static --without-examples
@@ -62,14 +66,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT XFONTDIR=$RPM_BUILD_ROOT%{_x11fontdir}
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT XFONTDIR=$RPM_BUILD_ROOT%{_x11fontdir} \
+   INSTALL='install -p'
+rm $RPM_BUILD_ROOT%{_libdir}/libdockapp.la
 # fonts.alias is empty, so unusefull.
 rm $RPM_BUILD_ROOT%{_x11fontdir}/dockapp/fonts.alias
 
-rm -rf examples-devel
-cp -a examples examples-devel
-rm examples-devel/Makefile*
+rm -rf __examples_dist
+cp -a examples __examples_dist
+rm __examples_dist/Makefile*
+
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,16 +109,27 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples-devel/*
+%doc __examples_dist/*
 %{_includedir}/*
 %{_libdir}/*.so
 
 %files fonts
+%defattr(-,root,root,-)
 # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
 %{_x11fontdir}/
 #%{_x11fontdir}/dockapp/
+%{catalogue}/dockapp
 
 %changelog
+* Thu Dec 27 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-5
+- minor cleanups
+
+* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
+- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson
+
+* Thu May 24 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-3
+- fix libtool bug on ppc64
+
 * Wed Jan 10 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-2
 - don't ship the empty fonts.alias