Browse Source

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

kudoh 11 years ago
parent
commit
a367e7860c
2 changed files with 35 additions and 12 deletions
  1. 14 3
      g/glabels/glabels-vl.spec
  2. 21 9
      m/mirage/mirage-vl.spec

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

@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	3.0.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	A program for creating labels and business cards for GNOME
 Summary(ja):	GNOME 用のラベルと名刺を作成するためのプログラム
 
@@ -9,7 +9,7 @@ License:	GPLv3+
 URL:		http://glabels.sf.net
 
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
-#Patch0: 	%{name}-libxml-XML_PARSE_HUGE.patch
+Patch0: 	glabels-fix-child-schemas.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -119,7 +119,8 @@ This package contains the template database for %{name}.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .libxml-XML_PARSE_HUGE
+%patch0 -p1 -b .fix-child-schemas
+
 sed -i 's/Icon=glabels-3.0.png/Icon=glabels-3.0/g' \
         data/desktop/glabels-3.0.desktop.in
 
@@ -155,6 +156,11 @@ if [ $1 -eq 0 ]; then
 	glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
 fi
 
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
 
 %post	libs -p /sbin/ldconfig
 
@@ -169,6 +175,7 @@ scrollkeeper-update -q ||:
 
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %clean
 rm -rf %{buildroot}
@@ -219,6 +226,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 12 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.0.0-2
+- added Patch0 from Fedora
+- run gtk-update-icon-cache in %%posttrans, %%postun
+
 * Sat Sep 17 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.0.0-1
 - new upstream release
 - changed License: GPLv2+ to GPLv3+

+ 21 - 9
m/mirage/mirage-vl.spec

@@ -1,21 +1,26 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		mirage
-Version:	0.9.5.2
-Release:	1%{?_dist_release}
+Version:	1.0
+Release:	1.svn358%{?_dist_release}
 Summary:	A fast and simple image viewer
 Summary(ja):	高速でシンプルな画像ビューア
 
 Group:		Applications/Graphics
 License:	GPLv3+
 URL:		http://mirageiv.berlios.de/
-Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}.tar.bz2
+Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}-svn358.tar.bz2
+Source1:	mirage_ja.po
+Patch0:        setup.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:	gettext
-BuildRequires:	libX11-devel
-BuildRequires:	python-devel
-BuildRequires:	desktop-file-utils
+BuildRequires: gettext
+BuildRequires: libX11-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+
+Requires:	pyexiv2
 Requires:	pygtk2 >= 2.12.0
 Requires:	gtk2 >= 2.10.0
 Requires:	gnome-python
@@ -32,9 +37,11 @@ PyGTK だけに依存するので、Mirage はコンピュータをスリムで
 
 
 %prep
-%setup -q
+%setup -qn %{name}
 # Don't remove rebuilt files!
-%{__sed} -i.build -e '/Cleanup/,$d' setup.py
+%patch0 -p1
+#%{__sed} -i.build -e '/Cleanup/,$d' setup.py
+%{__cp} -f %{SOURCE1} po/ja.po
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -86,6 +93,11 @@ desktop-file-install \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Aug 12 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-1.svn358
+- new upstream snapshot
+- added Source1 and Patch0 to enable Japanese translation
+- added Requires: pyexiv2
+
 * Mon Feb 14 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.5.2-1
 - new upstream release