update: Terminal, libical, orage, xfprint, task-xfce

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

T/Terminal/Terminal-vl.spec

@@ -1,23 +1,24 @@
 Summary: modern terminal emulator for Xfce
 Summary(ja): Xfce用のターミナルエミュレータ
 Name: Terminal
-Version: 0.2.12
+Version: 0.4.6
 Release: 1%{?_dist_release}
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+
-#Patch0: Terminal-docmake.patch
-#Patch1: Terminal-usage.patch
-License: GPL
 Group: User Interface/Desktops
-URL: http://www.os-cillation.com/article.php?sid=40
+License: GPL
+URL: http://www.xfce.org/projects/terminal
+
+Source0: http://archive.xfce.org/src/apps/terminal/0.4/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libexo-devel >= 0.3.2
+BuildRequires: dbus-glib-devel >= 0.22
-BuildRequires: libxfcegui4-devel >= 4.6.0
+BuildRequires: gettext
-BuildRequires: libxfce4util-devel >= 4.6.0
+BuildRequires: glib2-devel >= 2.16.0
-BuildRequires: gtk2-devel
+BuildRequires: gtk2-devel >= 2.14.0
-BuildRequires: vte-devel >= 0.11.11
+BuildRequires: intltool >= 0.31
-BuildRequires: startup-notification-devel
+BuildRequires: libexo-devel >= 0.6.0
-BuildRequires: dbus-devel
+BuildRequires: pkgconfig
+BuildRequires: vte-devel >= 0.17.1
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -37,8 +38,6 @@ GNOMEターミナルエミュレータの代替たりうる、軽量で使いや
 
 %prep
 %setup -q
-#patch0 -p1
-#patch1 -p1
 
 %build
 %configure
@@ -46,46 +45,48 @@ GNOMEターミナルエミュレータの代替たりうる、軽量で使いや
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
-rm -rf docs_to_install
+rm -rf _docs_to_install
-mv $RPM_BUILD_ROOT%{_docdir}/Terminal docs_to_install
+mv $RPM_BUILD_ROOT%{_docdir}/Terminal _docs_to_install
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*.cache
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans 
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
+%files -f %{name}.lang
-%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%doc docs_to_install/*
+%doc _docs_to_install/*
+%{_bindir}/Terminal
+%{_bindir}/terminal
 %{_datadir}/%{name}/
-%{_datadir}/icons/hicolor/*/stock/navigation/*.png
-%{_datadir}/icons/hicolor/48x48/apps/Terminal.png
-%{_datadir}/icons/hicolor/scalable/apps/Terminal.svg
-%{_datadir}/pixmaps/terminal.xpm
-%{_localedir}/*/LC_MESSAGES/Terminal.mo
 %{_datadir}/applications/Terminal.desktop
+%{_datadir}/gnome-control-center/default-apps/*.xml
+%{_datadir}/icons/hicolor/*
+%{_datadir}/pixmaps/terminal.xpm
 %{_mandir}/man1/Terminal.1*
-%{_bindir}/Terminal
+%{_mandir}/*/man1/Terminal.1*
-%{_bindir}/terminal
-%{_libexecdir}/TerminalHelp
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.6-1
+- new upstream release
+
 * Sat May 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.12-1
 - new upstream release
 

lib/libi/libical/libical-vl.spec

@@ -1,20 +1,26 @@
 Name:		libical
-Version:	0.44
-Release:	2%{?_dist_release}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
+Version:	0.46
+Release:	1%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	LGPLv2 or MPLv1.1
 URL:		http://freeassociation.sourceforge.net/
 
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
-Patch0:		%{name}-0.43-implicit-pointer-conversion.patch
+Patch0:		libical-0.46-icaltimezone.patch
+Patch1:		libical-0.46-errors-are-fatal.patch
+Patch2:		libical-0.46-mkdir_p.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	byacc
 BuildRequires:	flex
+BuildRequires:	libtool
+Requires:	tzdata
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -48,13 +54,13 @@ korzystających z libical.
 #----------------------------------------------------------------------------
 %prep
 %setup -q
-## %patch0 -p1
+%patch0 -p1 -b .icaltimezone
+%patch1 -p1 -b .errors-are-fatal
+%patch2 -p1 -b .mkdir_p
+autoreconf -i -f
 
 %build
-%configure --disable-static -enable-cxx --enable-reentrant
+%configure --disable-static --enable-cxx --enable-reentrant --with-backtrace
-
-# Omit unused direct shared library dependencies.
-sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags}
 
@@ -80,14 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS
+%doc AUTHORS ChangeLog COPYING LICENSE NEWS README THANKS TODO
-%doc ChangeLog
-%doc COPYING
-%doc LICENSE
-%doc NEWS
-%doc README
-%doc THANKS
-%doc TODO
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}_cxx.so.*
 %{_libdir}/libicalss.so.*
@@ -109,6 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.46-1
+- new upstream release
+- added Patch0-2 from Fedora
+
 * Thu Sep 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.44-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

o/orage/orage-vl.spec

@@ -1,25 +1,29 @@
-Summary: 	Time-managing application for xfce4.
 Name: 		orage
-Version: 	4.6.1
+Summary: 	Time-managing application for xfce4.
+Version: 	4.8.1
 Release: 	1%{?_dist_release}
-License:	GPL
+
-URL: 		http://www.xfce.org/
-Source0: 	http://www.xfce.org/archive/xfce-4.6.1/src/%{name}-%{version}.tar.bz2
 Group: 		Applications/Accessories
+License:	GPLv2
+URL: 		http://www.xfce.org/projects/orage
+
+Source0: 	http://archive.xfce.org/src/apps/%{name}/4.8/%{name}-%{version}.tar.bz2
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-#Requires: libxfce4mcs libxfce4util libxfcegui4
+BuildRequires:	dbus-glib-devel >= 0.34
-#Requires: xfce-mcs-manager xfce4-panel
+BuildRequires:	gettext
-BuildRequires: libxfce4util-devel
+BuildRequires:	gtk2-devel >= 2.10.0
-BuildRequires: libxfcegui4-devel
+BuildRequires:	intltool >= 0.31
-BuildRequires: xfconf-devel
+BuildRequires:	libical-devel >= 0.43
-BuildRequires: xfce4-panel-devel
+BuildRequires:	libnotify-devel >= 0.3.2
-BuildRequires: libnotify-devel
+BuildRequires:	pkgconfig
-BuildRequires: dbus-devel
+BuildRequires:	popt-devel
-#BuildRequires: xfce-mcs-manager-devel xfce4-panel
+BuildRequires:	xfce4-panel-devel >= 4.8.0
+
 Obsoletes: xfcalendar
 
 %description
-Time-managing application for xfce4
+Time-managing application for Xfce4
 
 %prep
 %setup -q
@@ -41,20 +45,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans 
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog COPYING AUTHORS NEWS
 %{_bindir}/orage
+%{_bindir}/tz_convert
 %{_bindir}/globaltime
 #{_libdir}/xfce4/
 %{_libexecdir}/xfce4/
@@ -62,10 +68,13 @@ fi
 %{_datadir}/dbus-1/services/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/orage/
-%{_datadir}/xfce4/panel-plugins/orageclock.desktop
+%{_datadir}/xfce4/panel-plugins/*.desktop
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.1-1
+- new upstream release
+
 * Sat May 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.1-1
 - new upstream release
 

t/task-xfce/task-xfce-vl.spec

@@ -1,15 +1,17 @@
-Summary: Virtual package for XFce
-Summary(ja): XFce バーチャルパッケージ
 Name: task-xfce
-Version: 4.6.1
+Summary: Virtual package for Xfce
-Release: 2%{?_dist_release}
+Summary(ja): Xfce バーチャルパッケージ
-License: public domain
+Version: 4.8.0
+Release: 1%{?_dist_release}
+
 Group: User Interface/Desktops
+License: public domain
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
 Requires: gtk-xfce-engine
-Requires: libxfce4util libxfcegui4 xfconf libexo
+Requires: libxfce4util libxfce4ui xfconf libexo
 Requires: xfce4-settings
 Requires: xfce-utils
 Requires: xfce4-panel
@@ -19,19 +21,22 @@ Requires: xfwm4 xfwm4-themes
 Requires: xfce4-icon-theme
 Requires: xfce4-appfinder
 Requires: xfce4-session xfce4-session-engines
-Requires: Thunar Terminal mousepad orage
+Requires: Thunar Terminal orage
 
 %description
-This is a virtual package to install XFce system packages.
+This is a virtual package to install Xfce system packages.
 If you use apt-get for RPM, This package willinstall
 all packages related to XFce automatically.
 
 %description -l ja
-XFce を簡単にインストールするための仮想パッケージです。
+Xfce を簡単にインストールするための仮想パッケージです。
 apt-get を使ってこのパッケージをインストールすることで、
-関連するXFceパッケージをすべてインストールすることができます。
+関連する Xfce パッケージをまとめてインストールすることができます。
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- Xfce 4.8.0
+
 * Fri Sep 11 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.1-2
 - added Requires: xfce4-icon-theme <wishes:192>
 

x/xfprint/xfprint-vl.spec

@@ -1,20 +1,24 @@
-Summary: 	Print dialog and printer manager for XFce 4
 Name: 		xfprint
+Summary: 	Print dialog and printer manager for XFce 4
 Version: 	4.6.1
-Release: 	2%{?_dist_release}
+Release: 	3%{?_dist_release}
-License:	BSD
+
+Group: 		User Interface/Desktops
+License:	GPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	cups-devel
+BuildRequires: 	glib2-devel >= 2.10.0
+BuildRequires: 	libxfce4util-devel >= 4.6.0
+BuildRequires: 	libxfcegui4-devel >= 4.6.0
+BuildRequires: 	xfconf-devel >= 4.6.0
 Requires:	glib2 >= 2.10.0
 Requires:	libxfce4util >= 4.6.0
 Requires:	libxfcegui4 >= 4.6.0
 Requires:	cups
-BuildRequires: 	glib2-devel >= 2.10.0
-BuildRequires: 	libxfce4util-devel >= 4.6.0
-BuildRequires: 	libxfcegui4-devel >= 4.6.0
-BuildRequires:	cups-devel
 
 %description
 xfprint contains a print dialog and a printer manager for the XFce 4 Desktop Environment
@@ -24,7 +28,7 @@ xfprint contains a print dialog and a printer manager for the XFce 4 Desktop Env
 
 %build
 %configure
-%__make
+make LIBS="-lX11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,15 +43,17 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/xfprint-plugins/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans 
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
+/sbin/ldconfig
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+if [ $1 -eq 0 ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %files -f %{name}.lang
@@ -65,6 +71,9 @@ fi
 
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.1-3
+- rebuild with krb5-libs-1.8.2
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.6.1-2
 - rebuild with rpm-4.8.1 for pkg-config file