Browse Source

pidgin: new upstream release, libzen: fix %install to add TinyXml directory

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1441 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 14 years ago
parent
commit
39f756e94c
2 changed files with 15 additions and 6 deletions
  1. 6 3
      lib/libz/libzen/libzen-vl.spec
  2. 9 3
      p/pidgin/pidgin-vl.spec

+ 6 - 3
lib/libz/libzen/libzen-vl.spec

@@ -13,7 +13,7 @@
 
 Name:			libzen
 Version:		0.4.15
-Release:		1%{?_dist_release}
+Release:		2%{?_dist_release}
 Summary:		Shared library for libmediainfo and medianfo-*
 Summary(ja):		libmediainfo 及び mediainfo-* 用の共有ライブラリ
 Group:			System/Libraries
@@ -39,7 +39,7 @@ libmediainfo 及び mediainfo-* 用の共有ライブラリです。
 Summary:	Include files and mandatory libraries for development
 Summary(ja):	libzen の開発用のヘッダとライブラリファイル
 Group:		Development/Libraries
-Requires:	libzen = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description -n libzen-devel
 Include files and mandatory libraries for development.
@@ -82,7 +82,7 @@ popd
 %__install -dm 755 %{buildroot}%{_includedir}/ZenLib
 %__install -m 644 Source/ZenLib/*.h \
 	%{buildroot}%{_includedir}/ZenLib
-for i in Base64 HTTP_Client Format/Html Format/Http; do
+for i in Base64 HTTP_Client Format/Html Format/Http TinyXml; do
 	%__install -dm 755 %{buildroot}%{_includedir}/ZenLib/$i
 	%__install -m 644 Source/ZenLib/$i/*.h \
 		%{buildroot}%{_includedir}/ZenLib/$i
@@ -120,6 +120,9 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jul 24 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.15-2
+- fix %install (add install directory)  
+
 * Tue Jun 15 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.15-1
 - new upstream release
 

+ 9 - 3
p/pidgin/pidgin-vl.spec

@@ -16,15 +16,15 @@
 Summary:	A GTK+ based multi-protocol instant messaging client
 Summary(ja):	マルチプロトコル対応のインスタントメッセンジャー
 Name:		pidgin
-Version:	2.6.6
-Release:	2%{?_dist_release}
+Version:	2.7.1
+Release:	1%{?_dist_release}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://jaist.dl.sourceforge.net/sourceforge/pidgin/%{name}-%{version}%{?extraver:%{extraver}}.tar.bz2
 # Source1:	http://mikeforce.homelinux.org/gnome/po/pidgin-ja.po
 Source1:	pidgin-2.6.2-ja.po
-Patch0:	        http://www.honeyplanet.jp/%{name}-2.6.6_jp.diff.gz
+Patch0:	        http://www.honeyplanet.jp/%{name}-2.7.1_jp.diff.gz
 Patch1:		%{name}-2.0.0beta7_jp-enable-shortcut.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel >= %{_gtk_ver}, glib2-devel >= %{_glib_ver}
@@ -55,6 +55,7 @@ BuildRequires:  gstreamer-devel >= %{_gst_ver}
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  NetworkManager-devel
 BuildRequires:	dbus-glib-devel >= %{_dbus_ver}
+BuildRequires:	libSM-devel
 %endif
 
 Requires:	libpurple = %{version}-%{release}
@@ -335,6 +336,11 @@ fi
 %{_libdir}/pkgconfig/gnt.pc
 
 %changelog
+* Sat Jul 24 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.7.1-1
+- new upstream release
+- update patch0 for pidgin-2.7.1
+- add BuildRequires: libSM-devel
+
 * Wed Mar  3 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> - 2.6.6-2
 - update patch0 (jp-patch is released. Thanks!!)