Browse Source

poedit: update to 1.4.6.1, others: rebuild

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4165 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 13 years ago
parent
commit
847399e458
3 changed files with 23 additions and 14 deletions
  1. 8 3
      c/cmemo/cmemo-vl.spec
  2. 4 1
      p/poedit/poedit-vl.spec
  3. 11 10
      w/wbar/wbar-vl.spec

+ 8 - 3
c/cmemo/cmemo-vl.spec

@@ -2,7 +2,7 @@ Summary: Cmemo is cool and useful GTK text editor.
 Summary(ja): Cmemo はシンプルで使いやすい GTK テキストエディタ
 Name: cmemo
 Version: 2.1.4
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: GPL
 Group: Applications/Editors
 ## Autoconf/Automake/rpm version
@@ -13,7 +13,8 @@ Source1:	cmemo2.desktop
 
 #---------------------------------------------------------------------------
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2, gtk2-devel, automake, gettext
+BuildRequires: gtk2-devel, automake, gettext
+BuildRequires: desktop-file-utils
 
 #### orignal developer
 # Source: http://www1.neweb.ne.jp/wb/smusic/soft/archives/cmemo213.tar.gz
@@ -67,7 +68,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %setup -q %{name}-%{version}
 
 %build
-./configure --prefix=%{_prefix}
+%configure --with-x
 make
 
 %install
@@ -137,6 +138,10 @@ fi
 
 #----------------------------------------------------------------------------
 %changelog
+* Sat Jun 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.4-5
+- rebuild with current VineSeed environment
+- add BuildRequires: desktop-file-utils
+
 * Sat Sep 06 2008 Shu KONNO <owa@bg.wakwak.com> 2.1.4-4
 - changed locale condition at %%post
 

+ 4 - 1
p/poedit/poedit-vl.spec

@@ -1,5 +1,5 @@
 %define name	poedit
-%define version	1.4.2
+%define version	1.4.6.1
 %define release	1%{?_dist_release}
 
 Summary:	Gettext catalogs editor
@@ -69,6 +69,9 @@ Poedit はクロス・プラットフォームな gettext カタログ (.po フ
 %{_mandir}/man1/poedit.1.gz
 
 %changelog
+* Sat Jun 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.6.1-1
+- new upstream release
+
 * Wed Apr 01 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 1.4.2-1
 - new upstream release
 

+ 11 - 10
w/wbar/wbar-vl.spec

@@ -2,18 +2,11 @@
 %define wbarconfversion 0.5
 %define wbar_utilversion 1.0
 
-%if %{?_dist_release} == "vl5"
-#%define ttfontdir /usr/share/fonts
 %define ttfontdir /usr/share/fonts/TrueType-vlgothic
 %define vlgothic TrueType-vlgothic
-%endif
-%if %{?_dist_release} == "vl4"
-%define ttfontdir /usr/X11R6/lib/X11/fonts/TrueType
-%define vlgothic TrueType-sazanami
-%endif
 
 Version:        1.3.3
-Release:        6%{?_dist_release}
+Release:        7%{?_dist_release}
 
 Name:           wbar
 Summary:        Quick Launch Bar such as a Dock of Max OS X
@@ -55,6 +48,7 @@ Patch11:        wbar_util-1.0-vine.patch
 #Patch12:       wbar-dot-bar-default.patch
 Patch13:        wbar-dot-bar-default2.patch
 Patch14:        wbar-session.patch
+Patch15:	wbar-1.3.3_gcc43_fixes.patch
 
 ## ja_po
 Source11:       wbar_util-1.0-ja.po
@@ -71,6 +65,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  libstdc++34-devel 
 BuildRequires:  make 
 BuildRequires:  glibc-devel
+BuildRequires:  desktop-file-utils
 Requires:       imlib2-loader
 %if %{?_dist_release} == "vl5"
 Requires:       pyxdg zenity
@@ -136,6 +131,7 @@ Xfdesktop あるいは Nautilus のようなデスクトップの最前面で起
     iconpack/wbar.osx/
 
 %patch14 -p1
+%patch15 -p1
 
 ## ja_po
 %__install -d -m0755 wbar_util/opt/wbar_util/locale/ja/LC_MESSAGES
@@ -209,11 +205,11 @@ popd
 
 
 %post
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
+%{_bindir}/update-desktop-database -q %{_datadir}/applications || :
 
 
 %postun
-%{_bindir}/update-desktop-database %{_datadir}/applications
+%{_bindir}/update-desktop-database -q %{_datadir}/applications
 
 
 %files
@@ -233,6 +229,11 @@ popd
 %{_datadir}/wbar_util
 
 %changelog
+* Sat Jun 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.3-7
+- rebuild with current VineSeed environment
+- add Patch15 (wbar-1.3.3_gcc43_fixes.patch)
+- add BuildRequires: desktop-file-utils
+
 * Mon May 18 2009 KATO Masashi <mkato@par.odn.ne.jp> 1.3.3-6
 - added Requires for pyxdg (for main.py) and zenity (for warning messages)
 - updated wbar.desktop: