Browse Source

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

kudoh 11 years ago
parent
commit
ff9ec87c17
3 changed files with 134 additions and 34 deletions
  1. 7 2
      T/TrueType-migmix/TrueType-migmix-vl.spec
  2. 14 3
      g/guake/guake-vl.spec
  3. 113 29
      h/hotot/hotot-vl.spec

+ 7 - 2
T/TrueType-migmix/TrueType-migmix-vl.spec

@@ -6,8 +6,8 @@ Name: TrueType-%{fontname}
 Summary: MigMix fonts are combined fonts that use IPA and M+ fonts
 Summary: MigMix fonts are combined fonts that use IPA and M+ fonts
 Summary(ja): M+とIPAの合成フォント MigMix フォント
 Summary(ja): M+とIPAの合成フォント MigMix フォント
 Version: 20120411
 Version: 20120411
-Release: 1%{?_dist_release}
-License: IPA Font License, M plus Font License
+Release: 2%{?_dist_release}
+License: IPA Font License
 Group: User Interface/X
 Group: User Interface/X
 URL: http://mix-mplus-ipa.sourceforge.jp/migmix/
 URL: http://mix-mplus-ipa.sourceforge.jp/migmix/
 
 
@@ -91,6 +91,11 @@ cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
 %doc ipag0030*/*.txt mplus-TESTFLIGHT-04*/* migmix-README.txt
 %doc ipag0030*/*.txt mplus-TESTFLIGHT-04*/* migmix-README.txt
 
 
 %changelog
 %changelog
+* Sat Jul 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 20120411-2
+- removed M plus Font License
+  - because IPA font Lisence do not coexist other lisence
+    (http://d.hatena.ne.jp/itouhiro/20120607)
+
 * Wed Apr 25 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 20120411-1
 * Wed Apr 25 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 20120411-1
 - new upstream release
 - new upstream release
 
 

+ 14 - 3
g/guake/guake-vl.spec

@@ -3,11 +3,12 @@
 Summary:	Drop-down terminal for GNOME Desktop Environment
 Summary:	Drop-down terminal for GNOME Desktop Environment
 Summary(ja): 	GNOME 用のドロップダウン式の端末エミュレータ
 Summary(ja): 	GNOME 用のドロップダウン式の端末エミュレータ
 Name:		guake
 Name:		guake
-Version:	0.4.3
-Release: 	2%{?_dist_release}
+Version:	0.4.4
+Release: 	1%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
 #Source1:	guake-0.4.1-ja.po
 #Source1:	guake-0.4.1-ja.po
 Patch0:         0001-Fix-focus-issue-on-gnome-shell.patch
 Patch0:         0001-Fix-focus-issue-on-gnome-shell.patch
+Patch1:         0001-Fix-notification.patch
 
 
 License:	GPLv2+
 License:	GPLv2+
 Group:		Applications/Accessories
 Group:		Applications/Accessories
@@ -46,6 +47,7 @@ sed -i 's/Categories=GNOME;GTK;Utility;TerminalEmulator;/Categories=GNOME;GTK;Ut
         data/guake.desktop.in
         data/guake.desktop.in
 
 
 %patch0 -p1
 %patch0 -p1
+%patch1 -p1
 
 
 %build
 %build
 %configure --disable-static \
 %configure --disable-static \
@@ -78,6 +80,8 @@ fi
 
 
 %post
 %post
 update-desktop-database &>/dev/null || :
 update-desktop-database &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 # install schemas after install/update
 # install schemas after install/update
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 gconftool-2 --makefile-install-rule \
@@ -93,6 +97,7 @@ fi
 
 
 %postun
 %postun
 update-desktop-database &>/dev/null || :
 update-desktop-database &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 
 
 %clean
 %clean
@@ -108,14 +113,20 @@ update-desktop-database &>/dev/null || :
 %{_datadir}/applications/%{name}-prefs.desktop
 %{_datadir}/applications/%{name}-prefs.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/dbus-1/services/org.guake.Guake.service
 %{_datadir}/dbus-1/services/org.guake.Guake.service
+%{_datadir}/icons/hicolor/*/
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/pixmaps/%{name}
 %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}
 %{_mandir}/man1/guake.1*
 %{_mandir}/man1/guake.1*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_sysconfdir}/xdg/autostart/%{name}.desktop
+#%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 
 
 
 %changelog
 %changelog
+* Sat Jul 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.4-1
+- new upstream release
+- added Patch1 from Fedora
+- run gtk-update-icon-cache in %%post, %%posutn
+
 * Thu Jun 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.3-2
 * Thu Jun 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.3-2
 - run desktop-file-validate in %%check
 - run desktop-file-validate in %%check
 
 

+ 113 - 29
h/hotot/hotot-vl.spec

@@ -1,79 +1,163 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           hotot
 Name:           hotot
-Version:        0.9.7.37
-Release:        2.git20120205%{?_dist_release}
+Version:        0.9.8.7
+Release:        1.git20120728%{?_dist_release}
 Summary:        Hotot lightweight & open source microblogging client using Python language and designed for Linux.
 Summary:        Hotot lightweight & open source microblogging client using Python language and designed for Linux.
 Summary(ja):    Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けのマイクロブログクライアントです。
 Summary(ja):    Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けのマイクロブログクライアントです。
 
 
 Group:          Applications/Internet
 Group:          Applications/Internet
 License:        LGPLv3+
 License:        LGPLv3+
 URL:            http://code.google.com/p/hotot
 URL:            http://code.google.com/p/hotot
-Source0:        hotot-%{version}-git20120205.tar.bz2
-Patch0:         fix_messages_ja.patch
+Source0:        hotot-%{version}-git20120728.tar.xz
+#Patch0:        fix_messages_ja.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
-BuildArch: noarch
-
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: intltool
-#BuildRequires: pygtk2-devel WebKit-gtk-devel libxslt-devel
+BuildRequires: kdelibs-devel
+BuildRequires: pygtk2-devel WebKit-gtk-devel libxslt-devel
 BuildRequires: python-devel
 BuildRequires: python-devel
 BuildRequires: python-distutils-extra
 BuildRequires: python-distutils-extra
+BuildRequires: qt4-devel
 
 
-Requires: python-keybinder
+%description
+Hotot, is a lightweight & open source Microblogging Client, 
+coding using Python language and designed for Linux.
+It depends less but supports more. 
+It's been developed actively and still in Alpha stage.
+
+%description -l ja
+Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けの
+マイクロブログクライアントです。
+依存はより少なく、より多くのサポートを。
+活発に開発していますが、まだアルファの段階です。
+
+
+%package common
+Summary: common files for Hotot
+Summary(ja): Hotot の共通ファイル
+Group: Applications/Internet
+BuildArch: noarch
+
+%description common
+Hotot, is a lightweight & open source Microblogging Client, 
+coding using Python language and designed for Linux.
+This package contains Hotot common files. 
+
+%description common -l ja
+Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けの
+マイクロブログクライアントです。
+このパッケージは Hotot の共通ファイルを含んでいます。
+
+
+%package gtk
+Summary: Hotot GTK+ client
+Summary(ja): Hotot GTK+ クライアント
+Group: Applications/Internet
+
+Requires: %{name}-common = %{version}
 Requires: notify-python
 Requires: notify-python
-Requires: pygobject
 Requires: pygtk2
 Requires: pygtk2
+Requires: pygobject
+Requires: python-keybinder
 Requires: pywebkitgtk >= 1.1.8
 Requires: pywebkitgtk >= 1.1.8
 
 
-%description
+%description gtk
 Hotot, is a lightweight & open source Microblogging Client, 
 Hotot, is a lightweight & open source Microblogging Client, 
 coding using Python language and designed for Linux.
 coding using Python language and designed for Linux.
 It depends less but supports more. 
 It depends less but supports more. 
 It's been developed actively and still in Alpha stage.
 It's been developed actively and still in Alpha stage.
+This package contains Hotot GTK+ client. 
 
 
-%description -l ja
+%description gtk -l ja
 Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けの
 Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けの
 マイクロブログクライアントです。
 マイクロブログクライアントです。
 依存はより少なく、より多くのサポートを。
 依存はより少なく、より多くのサポートを。
 活発に開発していますが、まだアルファの段階です。
 活発に開発していますが、まだアルファの段階です。
+このパッケージは Hotot の GTK+ クライアントを含んでいます。
+
+
+%package qt
+Summary: Hotot qt client
+Summary(ja): Hotot qt クライアント
+Group: Applications/Internet
+
+Requires: %{name}-common = %{version}
+
+%description qt
+Hotot, is a lightweight & open source Microblogging Client, 
+coding using Python language and designed for Linux.
+It depends less but supports more. 
+It's been developed actively and still in Alpha stage.
+This package contains Hotot Qt client. 
+
+%description qt -l ja
+Hotot は Python 言語を使用した、軽量&オープンソースな Linux 向けの
+マイクロブログクライアントです。
+依存はより少なく、より多くのサポートを。
+活発に開発していますが、まだアルファの段階です。
+このパッケージは Hotot の Qt クライアントを含んでいます。
+
 
 
 %prep
 %prep
 %setup -q -n %{name}
 %setup -q -n %{name}
-%patch0 -p1
+#%patch0 -p1
 
 
 %build
 %build
-python setup.py build_i18n -m
-python setup.py build
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_GIR=OFF ./
+make %{?_smp_mflags}
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --prefix=$RPM_BUILD_ROOT/usr
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %find_lang %{name}
 %find_lang %{name}
 
 
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
+
 %clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%post common
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun common
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 
-%files -f %{name}.lang
+%files common -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{python_sitelib}/%{name}
+%doc ChangeLog LGPL-license.txt README.md
+%{_datadir}/%{name}/
+%{_datadir}/icons/*
+
+%files gtk
+%defattr(-,root,root,-)
+%{python_sitearch}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/%{name}
-%{python_sitelib}/%{name}-*.egg-info
-%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}.desktop
 
 
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-qt
+%{_datadir}/applications/%{name}-qt.desktop
+
+
 %changelog
 %changelog
-* Mon Feb 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.9.7.37-2.git20120205
-- rebuild with python-2.7.2
+* Sat Jul 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.8.7-1.git20120728
+- new upstream snapshot
+- splitted packages to hotot-common, hotot-gtk, hotot-qt
+
+* Wed Feb 29 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.7.45-1.git20120310
+- new upstream release
+- deleted BuildArch: noarch
+- added BuildRequires: cmake
 
 
 * Mon Feb 06 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.7.37-1.git20120205
 * Mon Feb 06 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.7.37-1.git20120205
 - new upstream release
 - new upstream release