2014-10-09 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* ModemManager, NetworkManager: fixed BR: R:
	* kdegames3: added Patches from FC
	* planner: updated and added Patches from FC
	


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

M/ModemManager/ModemManager-vl.spec

@@ -1,13 +1,13 @@
 #%define git_snapshot .git20130607
 %define git_snapshot %{nil}
-%define ppp_version 2.4.5
+#define ppp_version 2.4.7
 %define glib2_version 2.40
 
+Name: ModemManager
 Summary: Mobile broadband modem management service
 Summary(ja): Mobile broadband modem management service
-Name: ModemManager
 Version: 1.2.0
-Release: 1%{git_snapshot}%{?_dist_release}
+Release: 2%{git_snapshot}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -25,17 +25,13 @@ Source: http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
 Patch0: buildsys-hates-openpty.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: dbus-glib
-Requires: glib2
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: dbus-glib-devel >= 0.92
+BuildRequires: eudev-libgudev1-devel 
-BuildRequires: libgudev1-devel >= 143
-BuildRequires: ppp = %{ppp_version}
-BuildRequires: ppp-devel = %{ppp_version}
 BuildRequires: automake autoconf intltool libtool
 BuildRequires: gtk-doc
 # for xsltproc
 BuildRequires: libxslt
+Requires: dbus-glib
 
 %description
 The ModemManager service manages WWAN modems and provides a consistent API for
@@ -55,7 +51,8 @@ Header files and libraries for building a extension library for the %{name}.
 
 %package	glib
 Summary:	Libraries for adding ModemManager support to applications that use glib.
-Group:		Development/Libraries
+Summary(ja):    Glib を使用するアプリケーションに ModemManager サポートを追加するためのライブラリ
+Group: 		System Environment/Libraries
 Requires:	glib2 >= %{glib2_version}
 
 %description	glib
@@ -82,17 +79,19 @@ Header files and libraries for building a extension library for the %{name}-glib
 %build
 autoreconf -if
 intltoolize --force
-pppddir=`ls -1d %{_libdir}/pppd/2*`
+#pppddir=`ls -1d %{_libdir}/pppd/2*`
 %configure \
+	--disable-static \
+	--enable-gtk-doc=yes \
+	--enable-introspection=no \
+	--enable-vala=no \
 	--enable-more-warnings=yes \
 	--with-udev-base-dir=/lib/udev \
-	--with-tests=yes \
+	--with-polkit=none \
-	--enable-gtk-doc=yes \
+	--without-mbim \
 	--without-qmi \
-	--disable-static \
+	--with-dist-version=%{version}-%{release} 
-	--with-pppd-plugin-dir=$pppddir \
+
-	--with-polkit=no \
-	--with-mbim=no
 
 make %{?_smp_mflags}
 
@@ -103,7 +102,7 @@ make check
 make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
-rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so
 
 %find_lang %{name}
 
@@ -160,6 +159,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Tue Oct  7 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2.0-2
+- moved ModemManager-glib to System Environment/Libraries Group
+- removed BR: ppp, ppp-devel and dbus-glib-devel
+
 * Sat Mar 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-1
 - new upstream release
 - remove Patch1 (ModemManager-1.0.0-git20130911.patch)

N/NetworkManager/NetworkManager-vl.spec

@@ -14,7 +14,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
 Version: 0.9.8.10
-Release: 1%{?snapshot}%{?_dist_release}
+Release: 2%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -32,13 +32,13 @@ Requires(preun): chkconfig
 Requires: iproute openssl
 Requires: dhclient
 Requires: wpa_supplicant
-Requires: libnl
+Requires: libnl3
 Requires: %{name}-glib = %{version}-%{release}
 Requires: ppp
 Requires: avahi
 Requires: dnsmasq
 Requires: initscripts >= 8.80.0
-Requires: udev
+Requires: eudev
 Requires: ModemManager >= %{mm_version}
 Requires: mobile-broadband-provider-info
 Obsoletes: dhcdbd
@@ -72,39 +72,35 @@ from a DHCP server, and change nameservers whenever it sees fit.
 
 %package devel
 Summary: Libraries and headers for adding NetworkManager support to applications
-Summary(ja): Libraries and headers for adding NetworkManager support to applications
+Summary(ja): アプリケーションに NetworkManager サポートを追加するためのライブラリ並びにヘッダファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-devel
-Requires: dbus-glib
 Requires: pkgconfig
 
 %description devel
-This package contains various headers accessing some NetworkManager functionality
+This package contains various headers accessing some NetworkManager functionality from applications.
-from applications.
 
 
 %package glib
 Summary: Libraries for adding NetworkManager support to applications that use glib.
-Summary(ja): Libraries for adding NetworkManager support to applications that use glib.
+Summary(ja): Glib を使用するアプリケーションに NetworkManager サポートを追加するためのライブラリ
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: dbus
 Requires: dbus-glib
 
 %description glib
-This package contains the libraries that make it easier to use some NetworkManager
+This package contains the libraries that make it easier to use some NetworkManager functionality from applications that use glib.
-functionality from applications that use glib.
 
 
 %package glib-devel
 Summary: Header files for adding NetworkManager support to applications that use glib.
-Summary(ja): Header files for adding NetworkManager support to applications that use glib.
+Summary(ja): Glib を使用するアプリケーションに NetworkManager サポートを追加するためのヘッダファイル
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-glib = %{version}-%{release}
+Requires: dbus-glib-devel
 Requires: glib2-devel
 Requires: pkgconfig
-Requires: dbus-glib-devel
 
 %description glib-devel
 This package contains the header and pkg-config files for development applications using
@@ -121,16 +117,19 @@ NetworkManager functionality from applications that use glib.
 NOCONFIGURE=1 ./autogen.sh
 sed -i "s|redhat-release|vine-release|g" configure
 %configure \
-	--disable-static \
+        --enable-silent-rules \
-	--with-distro=redhat \
+        --disable-static \
+	--enable-ifcfg-rh \
 	--with-dhclient=yes \
 	--with-dhcpcd=no \
 	--with-crypto=nss \
 	--with-docs=yes \
 	--enable-more-warnings=yes \
 	--enable-modify-system=yes \
-	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
-make
+	--with-dist-version=%{version}-%{release} 
+
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -252,6 +251,11 @@ fi
 
 
 %changelog
+* Sat Oct  4 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.9.8.10-2
+- updated Japanese summary
+- used 	--enable-ifcfg-rh instead of --with-distro=redhat
+- fixed Requires: libnl3 instead of libnl
+
 * Fri May 16 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.8.10-1
 - new upstream release
 

k/kdegames3/kdegames3-vl.spec

@@ -1,13 +1,11 @@
-%define make_cvs 1
-
 # These games are already in KDE 4.
 %define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines klickety kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name: kdegames3
-Summary: KDE Games not ported to KDE 4
+Summary: KDE 3 Games not ported to KDE 4
-Summary(ja): KDE 4 に移植されていない KDE ゲーム集
+Summary(ja): KDE 4 に移植されていない KDE 3 ゲーム集
 Version: 3.5.10
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Games
@@ -15,17 +13,21 @@ URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 Patch0: kdegames-3.5.10-trademarks.patch
-# fix build with make_cvs enabled and autoconf >= 2.64
-Patch1: arts-acinclude.patch
 # fix FTBFS with the new stricter ld in F13 (#565113)
 Patch2: kdegames-3.5.10-ftbfs.patch
 
+# fixes to common KDE 3 autotools machinery
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: kde3-acinclude.patch
+# remove flawed and obsolete automake version check in admin/cvs.sh
+Patch301: kde3-automake-version.patch
+# fix build failure with automake 1.13: add the --add-missing --copy flags
+# also add --force-missing to get aarch64 support (#925029/#925627)
+Patch302: kde3-automake-add-missing.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: zlib-devel libpng-devel libjpeg-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
+BuildRequires: kdelibs3-devel >= %{version}
 Requires: kdelibs3 >= %{version}
 Requires: hicolor-icon-theme 
 
@@ -51,15 +53,13 @@ KDE desktop.
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1
-%patch1 -p1 -b .autoconf
 %patch2 -p1 -b .ftbfs
 
 export DO_NOT_COMPILE="%{donotcompilelist}"
-%if %{make_cvs}
+%patch300 -p1 -b .acinclude
-# hack/fix for newer automake
+%patch301 -p1 -b .automake-version
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+%patch302 -p1 -b .automake-add-missing
-  make -f admin/Makefile.common cvs
+make -f admin/Makefile.common cvs
-%endif
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -171,6 +171,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Wed Oct  8 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-3
+- rebuilt with current VineSeed
+- added Patch300, 301 and 302 from FC
+- dropt Patch1
+
 * Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-2
 - dropt klickety
 

p/planner/planner-vl.spec

@@ -1,45 +1,64 @@
-Summary:	A graphical project management tool.
+Name: planner
-Summary(ja):	グラフィカルなプロジェクト管理ツール
+Summary: A graphical project management tool.
-Name:		planner
+Summary(ja): グラフィカルなプロジェクト管理ツール
-Version:	0.14.4
+Version: 0.14.6
-Release:	2%{?_dist_release}
+Release: 1%{?_dist_release}
-URL:		http://live.gnome.org/Planner
+
-Source0:	%{name}-%{version}.tar.bz2
+Group: Applications/Productivity
-# Patch0: refer https://bugzilla.gnome.org/show_bug.cgi?id=589045
+License: GPLv2+
-Patch0:		planner-0.14.4-build-fix.patch
+URL:http://live.gnome.org/Planner
-Patch1:		planner-0.14.4-edsapi.patch
+
-License:	GPL
+Source0: %{name}-%{version}.tar.xz
-Group:		Applications/Productivity
+Patch1:  planner-gnome596173-xdg.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+Patch2:  planner-gnome596966-editoninsert.patch
-
+Patch3:  planner-gnome550559-fitzoom.patch
-Obsoletes:	mrproject <= 0.11
+Patch4:  planner-gnome603693-planner-calendar-for-edittask.patch
-Obsoletes:      libmrproject <= 0.11
+Patch5:  planner-gnome604169-comboboxentry.patch
-Provides:       libplanner
+Patch6:  planner-gnome604510.calcolors.patch
-
+Patch7:  planner-gnome604531-tooltips.patch
-Requires:       popt
+Patch8:  planner-gnome581282-printpreview.patch
-Requires(post,postun): scrollkeeper >= 0.3.10
+Patch9:  planner-gnome606824-notecolumn.patch
-Requires(post,postun): shared-mime-info
+Patch10: planner-gnome341504-paste.tasks.patch
-Requires(post,postun): GConf2
+Patch11: planner-gnome615641-multiselect.patch
-
+Patch12: planner-gnome655803-bad-LC_TIME.patch
-BuildRequires:	gtk2-devel >= 2.6
+Patch13: planner-desktop-warnings.patch
+Patch14: planner-aarch64.patch
+Patch15: planner-rhbz1141479-paste.tasks.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires:	autoconf
+BuildRequires:  automake
+BuildRequires:	glib2-devel
+BuildRequires:	gnome-vfs2-devel >= 2.10.0
+BuildRequires:	gtk-doc
+BuildRequires:	gtk2-devel >= 2.6.0
+BuildRequires:	libICE-devel
+BuildRequires:	libSM-devel
+BuildRequires:	libglade2-devel >= 2.4.0
 BuildRequires:	libgnomecanvas-devel >= 2.10.0
 BuildRequires:	libgnomeui-devel >= 2.10.0
-BuildRequires:	libgnomeprintui-devel >= 2.10.0
+BuildRequires:	libgsf-devel >= 1.6
-BuildRequires:	gnome-vfs2-devel >= 2.10.0
+BuildRequires:  libtool >= 0.35.5
 BuildRequires:	libxml2-devel >= 2.6.0
 BuildRequires:	libxslt-devel >= 1.1.23
-BuildRequires:	GConf2-devel >= 2.10.0
+BuildRequires:  popt-devel
-BuildRequires:	libglade2-devel >= 2.4.0
 BuildRequires:	pygtk2-devel >= 2.6.0
-BuildRequires:	evolution-devel, evolution-data-server-devel
-BuildRequires:	libgsf-devel >= 1.6
-BuildRequires:	gtk-doc
-BuildRequires:	libSM-devel
-BuildRequires:	libICE-devel
 BuildRequires:	python-devel
-#BuildRequires:  libgda-devel 
+BuildRequires:  scrollkeeper
+BuildRequires:  valgrind-devel 
 
-Packager:	inagaki
+Obsoletes: planner-eds < 0.14.6
+Obsoletes: mrproject <= 0.11
+Obsoletes: libmrproject <= 0.11
+Provides: libplanner = %{version}-%{release}
+
+Requires(post,postun): scrollkeeper >= 0.3.10
+Requires(post,postun): shared-mime-info
+Requires(post,postun): GConf2
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: inagaki
 
 %description
 Planner is a visual project management application which allows users to
@@ -56,17 +75,19 @@ Planner はプロジェクトをさまざまな視点から管理することが
 
 
 %package devel
-Summary:     Header files, libraries for planner.
+Summary: Libraries and include files for developing with planner
 Summary(ja): Planner の開発用ファイル
-Group:       Development/Libraries
+Group: Development/Libraries
-Requires:    %{name} = %{version}
+Requires: %{name} = %{version}
-Obsoletes:   libmrproject-devel <= 0.11
+Requires: glib2-devel
-Provides:    libplanner-devel = %{version}
+Requires: libgsf-devel
+Requires: libxml2-devel
+Obsoletes: libmrproject-devel <= 0.11
+Provides: libplanner-devel = %{version}
 
 %description devel
-This package contains the header files, static libraries for %{name}. 
+This package provides the necessary development libraries and include
-If you like to develop programs using %{name}, you will need to install
+files to allow you to develop with planner.
-%{name}-devel.
 
 
 #%package database
@@ -84,32 +105,48 @@ If you like to develop programs using %{name}, you will need to install
 #Planner のデータベースサポートです．このプラグインを使うことで
 #プロジェクトを PostgreSQL データベースに保存することができます．
 
-
+#%package eds
-%package eds
+#Summary:    Planner integration with evolution
-Summary:    Planner integration with evolution
+#Summary(ja): Planner の evolution 用プラグイン
-Summary(ja): Planner の evolution 用プラグイン
+#Group:      Applications/Productivity
-Group:      Applications/Productivity
+#Requires:  %{name} = %{version}-%{release}
-Requires:  %{name} = %{version}-%{release}
+#
-
+#%description eds
-%description eds
+#This package provides a plugin to integration planner and evolution.
-This package provides a plugin to integration planner and evolution.
+#
-
+#%description eds -l ja
-%description eds -l ja
+#このパッケージは planner と evolution を連携できるようにする
-このパッケージは planner と evolution を連携できるようにする
+#プラグインを提供します。
-プラグインを提供します。
 
 %prep
 %setup -q
-%patch0 -p1 -b .build-fix
+%patch1  -p1 -b .xdg
-%patch1 -p1 -b .edsapi
+%patch2  -p1 -b .editoninsert
+%patch3  -p1 -b .fitzoom
+%patch4  -p1 -b .edittask
+%patch5  -p1 -b .combobox
+%patch6  -p1 -b .calcolors
+%patch7  -p1 -b .tooltips
+%patch8  -p1 -b .printpreview
+%patch9  -p1 -b .notecolumn
+%patch10 -p1 -b .copypaste
+%patch11 -p1 -b .multiselect
+%patch12 -p1 -b .gnome655803
+%patch13 -p1 -b .desktop-warnings
+%patch14 -p1 -b .aarch64
+%patch15 -p1 -b .systemvalgrind
 
 %build
-%configure --with-database=no \
+rm -rf libegg
-           --enable-python \
+autoreconf -f -i
-           --enable-eds-backend \
+
-           --disable-update-mimedb \
+%configure \
-           --disable-schemas-install \
+    --enable-python \
-           --disable-static
+    --disable-gtk-doc \
+    --disable-update-mimedb \
+    --disable-eds \
+    --disable-eds-backend \
+    --disable-static
 
 make
 
@@ -125,34 +162,50 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 #  --add-category X-Red-Hat-Base                             \
 #  %{buildroot}%{_datadir}/applications/planner.desktop
 
-/bin/rm -rf %{buildroot}/var/scrollkeeper
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-/bin/rm %{buildroot}/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-/bin/rm %{buildroot}/%{_libdir}/planner/file-modules/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/file-modules/*.la
-/bin/rm %{buildroot}/%{_libdir}/planner/storage-modules/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/storage-modules/*.la
-/bin/rm %{buildroot}/%{_libdir}/planner/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/*.la
-#/bin/rm %{buildroot}/%{_libdir}/planner/views/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/views/*.la
-/bin/rm %{buildroot}/%{_libdir}/python*/site-packages/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
-/bin/rm -rf %{buildroot}/%{_datadir}/doc/planner
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.la
-/bin/rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/*.la
-/bin/rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/*/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/storage-modules/libstorage-sql*
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/libsql-plugin*
-pushd $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions
+
-rm -f libecalbackendplanner.so
+rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/XMLnamespaces
-rm -f libecalbackendplanner.so.0
+rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/globs
-mv -f libecalbackendplanner.so.0.0.0 libecalbackendplanner.so
+rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/magic
-popd
+rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/application/*
-
+rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}/*.sql
-%find_lang %{name}
+rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}/*.planner
+
+#rhbz#1053553 wrong glibc locale name for sr-Latn
+mv $RPM_BUILD_ROOT/%{_datadir}/locale/sr@Latn $RPM_BUILD_ROOT/%{_datadir}/locale/sr@latin
+
+%find_lang %{name} 
 
 %post 
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &>/dev/null || :
 scrollkeeper-update > /dev/null 2>&1 || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/planner.schemas > /dev/null
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
 
 %postun
+/sbin/ldconfig
 scrollkeeper-update > /dev/null 2>&1 || :
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,17 +219,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libplanner*.so.*
 %{_libdir}/python*/site-packages/*.so
 %{_datadir}/applications/*
-#%{_datadir}/application-registry/*
 %{_datadir}/mime/packages/*
-#%{_datadir}/mime-info/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*
 %{_datadir}/planner
 %{_datadir}/gnome/help/planner
 %{_datadir}/omf/planner
 %{_mandir}/man1/planner*
-#%exclude %{_libdir}/planner/storage-modules/libstorage-sql*
-#%exclude %{_libdir}/planner/plugins/libsql-plugin*
 %exclude %{_datadir}/planner/glade/sql.glade
 %exclude %{_datadir}/planner/ui/sql-plugin.ui
 %exclude %{_datadir}/planner/sql
@@ -197,16 +246,21 @@ rm -rf $RPM_BUILD_ROOT
 #%{_datadir}/planner/ui/sql-plugin.ui
 #%{_datadir}/planner/sql
 
-%files eds
+#files eds
-%defattr(-,root,root,-)
+#defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/plugins
+#dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/evolution-data-server-1.2
+#dir %{_libdir}/evolution-data-server-1.2
-%dir %{_libdir}/evolution-data-server-1.2/extensions
+#dir %{_libdir}/evolution-data-server-1.2/extensions
-%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.so
+#{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.so
-%{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
+#{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
-%{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
+#{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
 
 %changelog
+* Sun Oct  5 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.14.6-1
+- updated to 0.14.6
+- removed eds subpackages
+- added Patches from FC
+
 * Sat Jun 18 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.14.4-2
 - rebuild for Vine Linux 6
 - add BuildRequires: libSM-devel, libICE-devel, python-devel