Attachment 1462 Details for Bug 8562 – kxmleditor-1.1.4-fix-build.patch

[patch] kxmleditor-1.1.4-fix-build.patch

kxmleditor-1.1.4-fix-build.patch (text/plain), 3.11 KB, created by Sergey V Turchin on 2006-04-21 15:02:16 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey V Turchin

Created: 2006-04-21 15:02:16 MSD

Size: 3.11 KB

patch

obsolete

>diff -u'Nrpk~' kxmleditor-1.1.4~/kxmleditor.spec kxmleditor-1.1.4/kxmleditor.spec
>--- kxmleditor-1.1.4~/kxmleditor.spec	2005-01-17 03:50:15 +0300
>+++ kxmleditor-1.1.4/kxmleditor.spec	2006-04-21 15:06:48 +0400
>@@ -1,39 +1,35 @@
>-%define qt_ver_major 3
>-%define qtdir %_libdir/qt%qt_ver_major
>-%define kdedir %(kde-config --prefix)
>+%define qtdir %_qt3dir
>+%define kdedir %prefix
> 
> Name: kxmleditor
> Version: 1.1.4
>-Release: alt1
>+Release: alt1.1
> 
> Packager: Yuri N. Sedunov <aris@altlinux.ru>
> 
> Group: Development/Other
>-Summary: KXML Editor for KDE 3.x
>-Summary(ru_RU.KOI8-R): òÅÄÁËÔÏÒ XML ÆÁÊÌÏ× ÄÌÑ KDE 3.x
>+Summary: KXML Editor for KDE
>+Summary(ru_RU.UTF-8): Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ XML ÑÐ°Ð¹Ð»Ð¾Ð² Ð´Ð»Ñ KDE
> License: GPL
> Url: http://kxmleditor.sourceforge.net
> 
> Source: %name-%version.tar.gz
> 
>-%define desktop_file_utils_ver 0.8
>-Requires(post,postun): desktop-file-utils >= %desktop_file_utils_ver
>-
>-BuildPreReq: menu-devel
>-BuildPreReq: desktop-file-utils >= %desktop_file_utils_ver
>-
> # Automatically added by buildreq on Thu Apr 15 2004
>-BuildRequires: XFree86-devel-static XFree86-libs fontconfig freetype2 gcc-c++ kde-settings kdelibs-devel libarts-devel libjpeg-devel libpng-devel libqt3-devel libstdc++-devel qt3-designer xml-utils zlib-devel
>+#BuildRequires: XFree86-devel-static XFree86-libs fontconfig freetype2 gcc-c++ kde-settings kdelibs-devel libarts-devel libjpeg-devel libpng-devel libqt3-devel libstdc++-devel qt3-designer xml-utils zlib-devel
>+
>+BuildRequires: xorg-x11-devel gcc-c++ kdelibs-devel libarts-devel libjpeg-devel
>+BuildRequires: libpng-devel libqt3-devel libstdc++-devel xml-utils zlib-devel
> 
> %description
> KXML Editor is a program that lets you browse and edit XML files.
> 
>-%description -l ru_RU.KOI8-R
>-KXML Editor ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÐÒÏÓÍÏÔÒÁ É ÒÅÄÁËÔÏÒÏ×ÁÎÉÑ XML ÆÁÊÌÏ×. 
>+%description -l ru_RU.UTF-8
>+KXML Editor Ð¿ÑÐµÐ´Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ XML ÑÐ°Ð¹Ð»Ð¾Ð². 
> 
> %prep
> %setup -q
>-%__subst 's,\.la\>,.so,' configure
>+#%__subst 's,\.la\>,.so,' configure
> %__subst 's,\$(kde_appsdir)/Applications,\$(datadir)/applications,' %name/Makefile.in
> 
> %build
>@@ -53,38 +49,30 @@ export QTDIR=%qtdir
> %install
> %make DESTDIR=%buildroot install 
> 
>-# menu
>-%__mkdir_p %buildroot/%_menudir
>-freedesktop2menu.pl %name "Applications/Publishing" \
>-    %buildroot/%_datadir/applications/%name.desktop \
>-    %buildroot/%_menudir/%name
>-
>-%__cp %buildroot/%_iconsdir/locolor/16x16/apps/%name.png %buildroot/%_iconsdir
>-
> %find_lang --with-kde %name
> 
> %post 
>-%post_ldconfig
> %update_menus
>-%update_desktopdb
>+%post_ldconfig
> 
> %postun 
>-%postun_ldconfig
> %clean_menus
>-%clean_desktopdb
>+%postun_ldconfig
> 
> %files -f %name.lang
> %_bindir/%name
> %_libdir/*.so*
> %_datadir/apps/%name
> %_datadir/services/*.desktop
>-%_iconsdir/*.png
>-%_iconsdir/*/*/*/*.png
>+%_iconsdir/*/*/apps/%name.png
> %_datadir/applications/%name.desktop
>-%_menudir/%name
> %doc ChangeLog AUTHORS KXMLEditor.flw README
> 
> %changelog
>+* Fri Apr 21 2006 Sergey V Turchin <zerg at altlinux dot org> 1.1.4-alt1.1
>+- spec cleanup
>+- fix build on current Sisyphus
>+
> * Mon Jan 17 2005 Yuri N. Sedunov <aris@altlinux.ru> 1.1.4-alt1
> - 1.1.4
>

Actions: View | Diff

Attachments on bug 8562: 1462