ソースを参照

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2406 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 14 年 前
コミット
7961ac8f94
2 ファイル変更19 行追加6 行削除
  1. 15 5
      k/keepnote/keepnote-vl.spec
  2. 4 1
      r/rednotebook/rednotebook-vl.spec

+ 15 - 5
k/keepnote/keepnote-vl.spec

@@ -1,13 +1,15 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary:        A note taking application
 Summary(ja):    ノート作成アプリケーション
 Name:           keepnote
-Version:        0.6.5
+Version:        0.6.7
 Release:        1%{?_dist_release}
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://rasm.ods.org/keepnote/
 Source0:        %{name}/%{name}-%{version}.tar.gz
-#Source1:        ja_JP.UTF8.po
+Source1:        ja_JP.UTF8.po
 
 Patch1:         Makefile_gettetxt.patch
 
@@ -43,8 +45,9 @@ KeepNote では、あなたの分類ノート、TODO リスト、研究ノート
 %setup -q
 %patch1 -p1
 
-#%{__cp} -f %{SOURCE1} gettext/ja_JP.UTF8.po
+%{__cp} -f %{SOURCE1} gettext/ja_JP.UTF8.po
 make -f Makefile.gettext make LANG=ja_JP.UTF8
+sed -i "s/Categories=Office/Categories=Office;/g" desktop/keepnote.desktop
 
 %build
 python setup.py build
@@ -55,7 +58,8 @@ rm -rf %{buildroot}
 python setup.py install --skip-build --root %{buildroot}
 
 desktop-file-install --vendor="" \
-     --add-category="Office" \
+     --delete-original \
+     --add-category="Office;" \
      --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/*
 
 %clean
@@ -78,10 +82,16 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/keepnote.png
-%{_libdir}/python2.*/*
+%{python_sitelib}/*
 
 
 %changelog
+* Tue Dec 28 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.7-1
+- new upstream release
+- re-added source1
+- fixed .desktop file a little
+- used python macro
+
 * Sat Oct 16 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.5-1
 - new upstream release
 - added BuildRequires:  gettext, intltool

+ 4 - 1
r/rednotebook/rednotebook-vl.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?_dist_release}
 Summary:        A desktop journal
 Summary(ja):    デスクトップダイアリー
@@ -79,6 +79,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Tue Dec 28 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.1.2-1
+- new upstream release
+
 * Mon Aug 23 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.1.1-1
 - new upstream release