Browse Source

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

kudoh 13 years ago
parent
commit
8124339e37

+ 40 - 72
T/TrueType-linux-libertine/TrueType-linux-libertine-vl.spec

@@ -4,20 +4,24 @@
 Name: TrueType-%{fontname}
 Name: TrueType-%{fontname}
 Summary: Linux libertine TrueType font
 Summary: Linux libertine TrueType font
 Summary(ja): Linux libertine TrueType フォント
 Summary(ja): Linux libertine TrueType フォント
-Version: 4.7.5
+Version: 5.0.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2+ and OFL
 License: GPLv2+ and OFL
 Group: User Interface/X
 Group: User Interface/X
 URL: http://sourceforge.net/projects/linuxlibertine/
 URL: http://sourceforge.net/projects/linuxlibertine/
-Source0: LinLibertineFont-%{version}-2.tgz
+Source0: LinLibertineTTF_2011_05_22.tgz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildArch: noarch
-Requires: TrueType-%{fontname}-bold >= %{version}
-Requires: TrueType-%{fontname}-regular >= %{version}
-Requires: TrueType-%{fontname}-italic >= %{version}
+#Requires: TrueType-%{fontname}-bold >= %{version}
+#Requires: TrueType-%{fontname}-regular >= %{version}
+#Requires: TrueType-%{fontname}-italic >= %{version}
 Requires: TrueType-%{fontname}-doc
 Requires: TrueType-%{fontname}-doc
 
 
+Obsoletes: TrueType-%{fontname}-bold
+Obsoletes: TrueType-%{fontname}-regular
+Obsoletes: TrueType-%{fontname}-italic
+
 %description
 %description
 The Linux Libertine Open Fonts are TrueType font family for practical
 The Linux Libertine Open Fonts are TrueType font family for practical
 use in documents. They were created to provide a free alternative to
 use in documents. They were created to provide a free alternative to
@@ -30,56 +34,31 @@ TrueType フォントファミリです。
 スタンダードフォントの代替品を無料で提供するために作成されました。
 スタンダードフォントの代替品を無料で提供するために作成されました。
 
 
 このパッケージは Linux libertine フォントのメタパッケージです。
 このパッケージは Linux libertine フォントのメタパッケージです。
-Bold・Regular・Italic の3書体をインストールします。
-
-%package bold
-Summary: Linux libertine bold font
-Summary(ja): Linux libertine bold フォント
-Group: User Interface/X
-Requires: TrueType-%{fontname}-doc
+libertine・biolinum の両パッケージをインストールします。
 
 
-%description bold
-This package includes Linux libertine bold fonts.
-
-%description -l ja bold
-このパッケージには Linux libertine bold フォントが含まれています。
-
-- Biolinum_Bd
-- LinLibertine_Bd
-
-%package regular
-Summary: Linux libertine regular font
-Summary(ja): Linux libertine regular フォント
+%package -n TrueType-libertine
+Summary: Linux Libertine font
+Summary(ja): Linux Libertine フォント
 Group: User Interface/X
 Group: User Interface/X
 Requires: TrueType-%{fontname}-doc
 Requires: TrueType-%{fontname}-doc
 
 
-%description regular
-This package includes Linux libertine regular fonts.
-
-%description -l ja regular
-このパッケージには Linux libertine regular フォントが含まれています。
+%description -n TrueType-libertine
+This package includes Linux Libertine fonts.
 
 
-- Biolinum_Re
-- LinLibertine_Re
-- LinLibertineC_Re
-- LinLibertine_C
-- LinBiolinum_Kb
+%description -l ja -n TrueType-libertine
+このパッケージには Linux Libertine フォントが含まれています。
 
 
-%package italic
-Summary: Linux libertine italic font
-Summary(ja): Linux libertine italic フォント
+%package -n TrueType-biolinum
+Summary: Linux biolinum font
+Summary(ja): Linux biolinum フォント
 Group: User Interface/X
 Group: User Interface/X
 Requires: TrueType-%{fontname}-doc
 Requires: TrueType-%{fontname}-doc
 
 
-%description italic
-This package includes Linux libertine italic fonts.
+%description -n TrueType-biolinum
+This package includes Linux biolinum fonts.
 
 
-%description -l ja italic
-このパッケージには Linux libertine italic フォントが含まれています。
-
-- LinLibertine_BI
-- LinLibertine_It
-- LinBiolinum_Sl
+%description -l ja -n TrueType-biolinum
+このパッケージには Linux biolinum フォントが含まれています。
 
 
 %package doc
 %package doc
 Summary: Linux libertine TrueType font document
 Summary: Linux libertine TrueType font document
@@ -96,9 +75,7 @@ includes enduser license.
 
 
 
 
 %prep
 %prep
-%setup -q -n LinLibertine
-cd Fonts
-mv *.ttf ../
+%setup -q -c LinLibertineTTF_2011_05_22
 
 
 %clean
 %clean
 if test -n "${RPM_BUILD_ROOT}" && test "/" != "${RPM_BUILD_ROOT}"; then
 if test -n "${RPM_BUILD_ROOT}" && test "/" != "${RPM_BUILD_ROOT}"; then
@@ -113,44 +90,35 @@ rm -rf %{buildroot}
 mkdir -p $RPM_BUILD_ROOT%{_fontdir}
 mkdir -p $RPM_BUILD_ROOT%{_fontdir}
 cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
 cp -a *.ttf $RPM_BUILD_ROOT%{_fontdir}
 
 
-%post bold
+%post -n TrueType-libertine
 %__font_install_post %{_fontdir}
 %__font_install_post %{_fontdir}
 
 
-%post regular
+%postun -n TrueType-libertine
 %__font_install_post %{_fontdir}
 %__font_install_post %{_fontdir}
 
 
-%post italic
+%post -n TrueType-biolinum
 %__font_install_post %{_fontdir}
 %__font_install_post %{_fontdir}
 
 
-
-%postun bold
-%__font_install_postun %{_fontdir}
-
-%postun regular
-%__font_install_postun %{_fontdir}
-
-%postun italic
-%__font_install_postun %{_fontdir}
+%postun -n TrueType-biolinum
+%__font_install_post %{_fontdir}
 
 
 %files
 %files
 
 
-%files bold
-%{_fontdir}/*_Bd-*.ttf
-
-%files regular
-%{_fontdir}/*_Re-*.ttf
-%{_fontdir}/LinLibertine_C-4.0.4.ttf
-%{_fontdir}/LinBiolinum_Kb-0.5.4.ttf
+%files -n TrueType-libertine
+%{_fontdir}/LinLibertine_*.ttf
 
 
-%files italic
-%{_fontdir}/*_It-*.ttf
-%{_fontdir}/*_BI-*.ttf
-%{_fontdir}/LinBiolinum_Sl-0.4.9.ttf
+%files -n TrueType-biolinum
+%{_fontdir}/LinBiolinum_*.ttf
 
 
 %files doc
 %files doc
-%doc *.txt
+%doc *.txt README
 
 
 %changelog
 %changelog
+* Sun Jun 12 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 5.0.0-1
+- new upstream release
+- obsoleted bold/regular/italic pacakages
+  - two new packages, TrueType-libertine and TrueType-biolinum
+
 * Sat Jan 2 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 4.7.5-1
 * Sat Jan 2 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 4.7.5-1
 - new upstream release
 - new upstream release
 - added Requires: TrueType-linux-libertine-{bold, regular, italic}
 - added Requires: TrueType-linux-libertine-{bold, regular, italic}

+ 7 - 1
c/cherrytree/cherrytree-vl.spec

@@ -3,7 +3,7 @@
 Summary:   CherryTree - note taking application
 Summary:   CherryTree - note taking application
 Summary(ja): CherryTree - ノート作成アプリケーション
 Summary(ja): CherryTree - ノート作成アプリケーション
 Name:	   cherrytree
 Name:	   cherrytree
-Version:   0.21.3
+Version:   0.22
 Release:   1%{?_dist_release}
 Release:   1%{?_dist_release}
 License:   GPLv2+
 License:   GPLv2+
 Group:     Applications/Productivity
 Group:     Applications/Productivity
@@ -14,9 +14,11 @@ Source0:   %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildArch: noarch
 
 
+BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 Requires:  cairo
 Requires:  cairo
 Requires:  pango
 Requires:  pango
 Requires:  python
 Requires:  python
@@ -91,6 +93,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Sun Jun 12 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.22-1
+- new upstream release
+- added BuildRequires: desktop-file-utils, python-setuptools
+
 * Wed May 4 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.21.3-1
 * Wed May 4 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.21.3-1
 - new upstream release
 - new upstream release
 
 

+ 9 - 3
t/tinyxml/tinyxml-vl.spec

@@ -1,8 +1,8 @@
-%define underscore_version 2_6_1
+%define underscore_version 2_6_2
 
 
 Name:           tinyxml
 Name:           tinyxml
-Version:        2.6.1
-Release:        3%{?_dist_release}
+Version:        2.6.2
+Release:        1%{?_dist_release}
 Summary:        A simple, small, C++ XML parser
 Summary:        A simple, small, C++ XML parser
 Summary(ja):    シンプルで小さな C++ XML パーサー
 Summary(ja):    シンプルで小さな C++ XML パーサー
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
@@ -13,6 +13,8 @@ Patch0:         tinyxml-2.5.3-stl.patch
 Patch1:         entity.patch
 Patch1:         entity.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
+BuildRequires: gcc-c++
+
 %description
 %description
 TinyXML is a simple, small, C++ XML parser that can be easily integrating
 TinyXML is a simple, small, C++ XML parser that can be easily integrating
 into other programs. Have you ever found yourself writing a text file parser
 into other programs. Have you ever found yourself writing a text file parser
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Jun 12 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.6.2-1
+- new upstream release
+- added BuildRequires: gcc-c++
+
 * Wed Sep 29 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.6.1-3
 * Wed Sep 29 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.6.1-3
 - rebuilt with rpm-4.8.1 for pkg-config
 - rebuilt with rpm-4.8.1 for pkg-config