Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10204 ec354946-7b23-47d6-9f5a-488ba84defc7
kudoh 8 years ago
parent
commit
343ca6f553
2 changed files with 47 additions and 10 deletions
  1. 22 6
      O/OpenType-takaofont/OpenType-takaofont-vl.spec
  2. 25 4
      g/gpicview/gpicview-vl.spec

+ 22 - 6
O/OpenType-takaofont/OpenType-takaofont-vl.spec

@@ -4,13 +4,15 @@
 Name:             OpenType-%{fontname}
 Summary:          Takao Fonts - community developed derivatives of IPA Fonts
 Summary(ja):      IPA フォントの派生版 Takao フォント
-Version:          3.02.01
-Release:          3%{?_dist_release}
+Version:          15.03
+Release:          1%{?_dist_release}
 License:          IPA Font License v1.0
 Group:            User Interface/X
 URL:              https://launchpad.net/takao-fonts
 
-Source0:          takao-fonts-ttf-00%{version}.tar.gz
+Source0:          TakaoFonts_00303.01.tar.xz
+Source1:          TakaoExFonts_00201.01.tar.xz
+Source2:          TakaoMjFonts_00301.01.tar.xz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildArch:        noarch
@@ -47,6 +49,7 @@ This package includes Takao Fonts (Mincho).
 - Takao Mincho
 - Takao PMincho
 - TakaoEx Mincho
+- TakaoMj Mincho
 
 %description -l ja mincho
 このパッケージには Takao フォントの明朝体フォントが含まれています。
@@ -54,6 +57,7 @@ This package includes Takao Fonts (Mincho).
 - Takao 明朝
 - Takao P明朝
 - TakaoEx 明朝
+- TakaoMj 明朝
 
 #-- ゴシック
 %package gothic
@@ -91,7 +95,7 @@ includes enduser license.
 
 
 %prep
-%setup -q -n takao-fonts-ttf-00%{version}
+%setup -q -c -n %{name}-%{version} -a 1 -a 2
 
 %clean
 if test -n "${RPM_BUILD_ROOT}" && test "/" != "${RPM_BUILD_ROOT}"; then
@@ -104,7 +108,7 @@ fi
 rm -rf %{buildroot}
 
 mkdir -p $RPM_BUILD_ROOT%{_fontdir}
-cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
+cp -a Takao{,Ex,Mj}Font*/*.ttf $RPM_BUILD_ROOT%{_fontdir}
 
 %post mincho
 %__font_install_post %{_fontdir}
@@ -122,6 +126,7 @@ cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
 
 %files mincho
 %{_fontdir}/TakaoMincho.ttf
+%{_fontdir}/TakaoMjMincho.ttf
 %{_fontdir}/TakaoPMincho.ttf
 %{_fontdir}/TakaoExMincho.ttf
 
@@ -131,9 +136,20 @@ cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
 %{_fontdir}/TakaoExGothic.ttf
 
 %files doc
-%doc ChangeLog IPA_Font_License_Agreement_v1.0.txt README README.ja
+%doc TakaoFonts_00303.01/IPA_Font_License_Agreement_v1.0.txt
+%doc TakaoFonts_00303.01/README
+%doc TakaoFonts_00303.01/README.ja
+%doc TakaoFonts_00303.01/ChangeLog
 
 %changelog
+* Thu Apr 28 2016 Toshiharu Kudoh <toshi.kd2@gmail.com> - 15.03-1
+- new upstream release
+  - changed numbering and included fonts
+    - TakaoFonts
+    - TakaoExFonts
+    - TakaoMJFonts
+- deleted BuildRequires: unzip
+
 * Sun Jan 12 2014 TANAKA hiroaki <mosaicist@jcom.home.ne.jp> 3.02.01-3
 - rebuilt with gcc-4.8
 

+ 25 - 4
g/gpicview/gpicview-vl.spec

@@ -1,13 +1,13 @@
 Name:           gpicview
-Version:        0.2.3
-Release:        2%{?_dist_release}
+Version:        0.2.5
+Release:        1%{?_dist_release}
 Summary:        A Simple and Fast Image Viewer for X
 Summary(ja):    X のシンプルで高速な画像ビューア
 
 Group:          Applications/Graphics
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/gpicview/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  libjpeg-turbo-devel, gtk2-devel, desktop-file-utils, gettext
@@ -47,6 +47,20 @@ desktop-file-install --vendor vine \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -54,10 +68,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gpicview
 %{_datadir}/applications/*
 %{_datadir}/gpicview/
-%{_datadir}/pixmaps/gpicview.png
+%{_datadir}/icons/hicolor/*/apps/gpicview.png
 
 
 %changelog
+* Thu Apr 28 2016 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.5-1
+- New upstream release
+- changed source archive type to xz
+- fixed %%files
+- run update-desktop-database in %%post, %%postun
+- run gtk-update-icon-cache in %%postun, %%posttrans
+
 * Tue Jul 01 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.3-2
 - rebuilt with current environment