Attachment 205711 Details for Bug 252280 – libdockapp.patch

[patch] libdockapp.patch

libdockapp.patch (text/plain), 1.71 KB, created by Adam Jackson on 2007-09-25 17:23:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2007-09-25 17:23:19 UTC

Size: 1.71 KB

patch

obsolete

>? .build-0.6.1-3.fc8.log
>? dockapp-0.6.1
>? libdockapp-0.6.1-3.fc8.src.rpm
>? libdockapp.spec.jx
>? x86_64
>Index: libdockapp.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/libdockapp/devel/libdockapp.spec,v
>retrieving revision 1.2
>diff -u -p -r1.2 libdockapp.spec
>--- libdockapp.spec	24 May 2007 08:13:29 -0000	1.2
>+++ libdockapp.spec	25 Sep 2007 17:15:04 -0000
>@@ -1,4 +1,5 @@
> %define _x11fontdir %{_datadir}/X11/fonts
>+%define catalogue /etc/X11/fontpath.d
> 
> Name:           libdockapp
> Version:        0.6.1
>@@ -43,8 +44,6 @@ developing applications that use %{name}
> %package        fonts
> Summary:        Fonts provided with %{name}
> Group:          User Interface/X
>-Requires(post):   chkfontpath
>-Requires(postun): chkfontpath
> 
> %description fonts
> Bitmap X fonts provided with libdockapp.
>@@ -74,6 +73,9 @@ rm -rf examples-devel
> cp -a examples examples-devel
> rm examples-devel/Makefile*
> 
>+mkdir -p $RPM_BUILD_ROOT%{catalogue}
>+ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>@@ -81,8 +83,6 @@ rm -rf $RPM_BUILD_ROOT
> %post -p /sbin/ldconfig
> 
> %post fonts
>-/usr/sbin/chkfontpath -qa %{_datadir}/X11/fonts/dockapp
>-
> if [ -x /usr/bin/fc-cache ]; then
>   /usr/bin/fc-cache %{_datadir}/X11/fonts
> fi
>@@ -94,7 +94,6 @@ if [ "$1" = "0" ]; then
>   if [ -x /usr/bin/fc-cache ]; then
>     /usr/bin/fc-cache %{_datadir}/X11/fonts
>   fi
>-  /usr/sbin/chkfontpath -qr %{_datadir}/X11/fonts/dockapp
> fi
> 
> %files
>@@ -112,6 +111,7 @@ fi
> # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
> %{_x11fontdir}/
> #%{_x11fontdir}/dockapp/
>+%{catalogue}/dockapp
> 
> %changelog
> * Thu May 24 2007 Patrice Dumas <pertusus@free.fr> 0.6.1-3

Actions: View | Diff

Attachments on bug 252280: 205711