[Kita-svn] [2405] - update a spec file (for openSUSE)

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 7月 13日 (月) 20:11:48 JST


Revision: 2405
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2405
Author:   nogu
Date:     2009-07-13 20:11:47 +0900 (Mon, 13 Jul 2009)

Log Message:
-----------
- update a spec file (for openSUSE)
- avoid compile errors on openSUSE 11.1

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
    kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
    kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
    kita/branches/KITA-KDE4/kita.spec

Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-07-12 04:20:57 UTC (rev 2404)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-07-13 11:11:47 UTC (rev 2405)
@@ -17,6 +17,7 @@
 #include <kactioncollection.h>
 #include <kmenu.h>
 #include <krun.h>
+#include <kstandardshortcut.h>
 
 #include "boardview.h"
 #include "favoritelistview.h"

Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-07-12 04:20:57 UTC (rev 2404)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-07-13 11:11:47 UTC (rev 2405)
@@ -18,6 +18,7 @@
 #include <kactioncollection.h>
 #include <klocale.h>
 #include <kshortcutsdialog.h>
+#include <kstandardshortcut.h>
 #include <ktabbar.h>
 
 /*--------------------------------------------------------------*/

Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-07-12 04:20:57 UTC (rev 2404)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-07-13 11:11:47 UTC (rev 2405)
@@ -16,6 +16,7 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
+#include <kstandardshortcut.h>
 
 #include "threadview.h"
 #include "viewmediator.h"

Modified: kita/branches/KITA-KDE4/kita.spec
===================================================================
--- kita/branches/KITA-KDE4/kita.spec	2009-07-12 04:20:57 UTC (rev 2404)
+++ kita/branches/KITA-KDE4/kita.spec	2009-07-13 11:11:47 UTC (rev 2405)
@@ -1,55 +1,41 @@
-%define version 0.200.0
-
-%define use_xdg_menu %{!?_with_xdg_menu:0}%{?_with_xdg_menu:1}
-
-%define is_suse      %(if [ -e /etc/SuSE-release ]; then echo "yes"; else echo "no"; fi)
-%if %{is_suse} == "yes"
-%define _prefix /opt/kde3
-%endif
-
-%define is_x86_64 %(if [ "x86_64" == `uname -m` ]; then echo "yes"; else echo "no"; fi)
-
 Summary: 2ch client for KDE
+Summary(ja): KDE 向けの 2ch ブラウザ
 Name: kita
-Version: %{version}
+Version: 0.200.0
 Release: 1
-Source: kita-%{version}.tar.gz
-License: GPL
 URL: http://sourceforge.jp/projects/kita/
+Source: kita-%{version}.tar.bz2
+License: GPL
 Group: Application/Internet
-Packager: Hideki Ikemoto <ikemo****@users*****>
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libkde4-devel
+%kde4_runtime_requires
 
-# TurboLinux uses 'Serial' field.
-#Serial: 2004051601
-
 %description
-2ch client for KDE	
+Kita is a 2ch client for KDE.
 
+%description -l ja
+Kita は KDE 向けの 2ch ブラウザです。
+
 %prep
 %setup -q
 
 %build
-./configure --prefix=%{_prefix} \
-%if %{is_x86_64} == "yes"
- --enable-libsuffix=64 \
- %if %{is_suse} == "yes"
- --with-qt-libraries=/usr/lib64/qt-3.3/lib64 \
- %else
- --with-qt-libraries=/usr/lib64/qt-3.3/lib \
- %endif
-%endif
-%if %{use_xdg_menu}
-  --enable-xdg-menu
-%endif
+%cmake_kde4 -d build
+%make_jobs
 
-make clean
-make
-
 %install
-rm -rf %{buildroot}
+cd build
 %makeinstall
+strip --strip-unneeded %{buildroot}/%{_libdir}/lib%{name}*.so*.*.*
+strip %{buildroot}/%{_bindir}/%{name}
+rm %{buildroot}/%{_libdir}/lib%{name}*.so
 
+%if 0%{?suse_version}
+%suse_update_desktop_file %{name}
+%endif
+%kde_post_install
+
 %clean
 rm -rf %{buildroot}
 
@@ -57,29 +43,23 @@
 %postun -p /sbin/ldconfig
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README README.2ch TODO
-%{_bindir}/*
-%{_libdir}/*.so*
-%{_libdir}/*.la
-#%{_libdir}/kde3/*.so
-#%{_libdir}/kde3/*.la
-%{_datadir}/apps/kita/*ui.rc
-%{_datadir}/apps/kita/icons/*/*/*/*
-#%{_datadir}/apps/konqsidebartng/*/*
-%if %{use_xdg_menu}
-%{_datadir}/applications/kita.desktop
-%else
-%{_datadir}/applnk/Internet/kita.desktop
-%endif
-#%{_datadir}/applnk/Settings/Network/kcm_k2ch.desktop
-#%{_datadir}/config/kio_k2chrc
-#%{_datadir}/services/*
-#%{_datadir}/mimelnk/text/*
-%{_datadir}/locale/ja/LC_MESSAGES/*
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/doc/HTML/en/kita/*
+#%doc AUTHORS COPYING ChangeLog NEWS README README.2ch TODO
+%{_bindir}/%{name}
+%{_libdir}/lib%{name}*.so*
+%{_datadir}/applications/kde4/%{name}.desktop
+%dir %{_datadir}/kde4/apps/%{name}
+%{_datadir}/kde4/apps/%{name}/*ui.rc
+%{_datadir}/kde4/config.kcfg/*.kcfg
+%{_datadir}/icons/hicolor/16x16/actions/*.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+#%{_datadir}/locale/ja/LC_MESSAGES/%{name}.mo
+%dir %{_datadir}/doc/kde/HTML/en/%{name}
+%{_datadir}/doc/kde/HTML/en/%{name}/common
+%{_datadir}/doc/kde/HTML/en/%{name}/index.cache.bz2
+%{_datadir}/doc/kde/HTML/en/%{name}/index.docbook
+
 %changelog
-* Sun Nov 21 2004 Hideki Ikemoto<ikemo****@users*****>
+* Sun Nov 21 2004 Hideki Ikemoto<ikemo****@users*****> - 0.173.0 
 - remove kitapart/kita*ui.rc
 
 * Sat Oct 07 2004 Hideki Ikemoto<ikemo****@users*****>




Kita-svn メーリングリストの案内
Back to archive index