Browse Source

2015-04-19 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* gnome-do, gnome-do-plugins, mod_mono, tasque: updated
	* gtksourceview-sharp2: added devel
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9521 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
ea9607717d

+ 91 - 45
g/gnome-do-plugins/gnome-do-plugins-vl.spec

@@ -1,23 +1,33 @@
 Name:           gnome-do-plugins
-Version:        0.8.2.1
+Version:        0.8.5
 Release:        1%{?_dist_release}
 Summary:        Plugins for GNOME Do
 Summary(ja): 	GNOME Do 用のプラグイン
 Group:          Applications/Accessories
 License:        GPLv3
 URL:            http://do.davebsd.com
-Source0:        http://edge.launchpad.net/do-plugins/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/do-plugins/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+
 Patch0:		gnome-do-0.8.2-fix-Makefile.in.patch
 Patch1:		gnome-do-plugins-wink.patch
 Patch2:		gnome-do-plugins-mono-2.8.patch
 Patch3:		gnome-do-plugins-mono-2.8-sqlite.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-devel ndesk-dbus-glib gnome-do-devel
+Patch70:	gnome-do-0.8.5-remove-transmission.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:	dbus-sharp-devel
+BuildRequires:	dbus-sharp-glib-devel
+BuildRequires:  mono-devel mono-addins-devel
 #BuildRequires:  flickrnet-devel banshee-devel evolution-sharp-devel
-BuildRequires:  gnome-sharp2 gtk-sharp2 gnome-desktop-sharp2
-BuildRequires:  gnome-keyring-sharp-devel mono-addins
-BuildRequires:  notify-sharp-devel wnck-sharp
+BuildRequires: 	gnome-desktop-sharp2-devel
+BuildRequires:	gnome-do-devel
+BuildRequires:  gnome-sharp2-devel
+BuildRequires:	gtk-sharp2-devel
+BuildRequires:  gnome-keyring-sharp-devel 
+BuildRequires:  notify-sharp-devel
+BuildRequires:	wnck-sharp-devel
 BuildRequires:  intltool 
 
 Packager:	kazutaka
@@ -45,6 +55,19 @@ This package contains various plugins for GNOME Do.
 #%description bibtex
 #gnome-do plugins for bibtex
 
+%package chromium
+Summary:        gnome-do-plugins for chromium
+Summary(ja):    GNOME Do の chromium プラグイン
+Group:          Applications/Accessories
+Requires:       gnome-do >= %{version}
+Requires: 	chromium
+
+%description chromium
+gnome-do plugins for chromium
+
+%description chromium -l ja
+GNOME Do の chromium プラグインです。
+
 #%package clawsmail
 #Summary:	gnome-do-plugins for clawsmail
 #Group:		Applications/Accessories
@@ -55,9 +78,10 @@ This package contains various plugins for GNOME Do.
 
 %package epiphany
 Summary:        gnome-do-plugins for epiphany
-Summary(ja):     GNOME Do の epiphany プラグイン
+Summary(ja):    GNOME Do の epiphany プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} epiphany
+Requires:       gnome-do >= %{version}
+Requires: 	epiphany
 
 %description epiphany
 gnome-do plugins for epiphany
@@ -75,9 +99,10 @@ GNOME Do の epiphany プラグインです。
 
 %package eog
 Summary:        gnome-do-plugins for Eye of Gnome
-Summary(ja):     GNOME Do の Eye of Gnome プラグイン
+Summary(ja):    GNOME Do の Eye of Gnome プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} eog
+Requires:       gnome-do >= %{version}
+Requires: 	eog
 
 %description eog
 gnome-do plugins for Eye of Gnome
@@ -86,10 +111,11 @@ gnome-do plugins for Eye of Gnome
 GNOME Do の Eye of Gnome プラグインです。
 
 %package firefox
-Summary:        gnome-do-plugins for firefox
-Summary(ja):     GNOME Do の firefox プラグイン
+Summary: 	gnome-do-plugins for firefox
+Summary(ja): 	GNOME Do の firefox プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} firefox
+Requires:       gnome-do >= %{version}
+Requires: 	firefox
 
 %description firefox
 gnome-do plugins for firefox 
@@ -107,9 +133,10 @@ GNOME Do の firefox プラグインです。
 
 %package pidgin
 Summary:        gnome-do-plugins for pidgin
-Summary(ja):     GNOME Do の pidgin プラグイン
+Summary(ja):    GNOME Do の pidgin プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} pidgin
+Requires:       gnome-do >= %{version}
+Requires:	pidgin
 
 %description pidgin
 gnome-do plugins for pidgin 
@@ -119,9 +146,10 @@ GNOME Do の pidgin プラグインです。
 
 %package rhythmbox
 Summary:        gnome-do-plugins for rhythmbox
-Summary(ja):     GNOME Do の rhythmbox プラグイン
+Summary(ja):    GNOME Do の rhythmbox プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} rhythmbox
+Requires:       gnome-do >= %{version}
+Requires: 	rhythmbox
 
 %description rhythmbox
 gnome-do plugins for rhythmbox
@@ -130,10 +158,11 @@ gnome-do plugins for rhythmbox
 GNOME Do の rhythmbox プラグインです。
 
 %package tomboy
-Summary:        gnome-do-plugins for tomboy
-Summary(ja):     GNOME Do の tomboy プラグイン
-Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} tomboy
+Summary: 	gnome-do-plugins for tomboy
+Summary(ja): 	GNOME Do の tomboy プラグイン
+Group: 		Applications/Accessories
+Requires:       gnome-do >= %{version}
+Requires: 	tomboy
 
 %description tomboy
 gnome-do plugins for tomboy 
@@ -143,9 +172,10 @@ GNOME Do の tomboy プラグインです。
 
 %package thunderbird
 Summary:        gnome-do-plugins for thunderbird
-Summary(ja):     GNOME Do の thunderbird プラグイン
+Summary(ja):    GNOME Do の thunderbird プラグイン
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} thunderbird
+Requires:       gnome-do >= %{version}
+Requires: 	thunderbird
 
 %description thunderbird
 gnome-do plugins for thunderbird
@@ -153,19 +183,22 @@ gnome-do plugins for thunderbird
 %description thunderbird -l ja
 GNOME Do の thunderbird プラグインです。
 
-#%package tasque
-#Summary:        gnome-do-plugins for tasque 
-#Group:          Applications/Accessories
-#Requires:       gnome-do >= %{version} tasque
-#
-#%description tasque
-#gnome-do plugins for tasque
+%package tasque
+Summary:        gnome-do-plugins for tasque 
+Summary(ja):    GNOME Do の tasque プラグイン
+Group:          Applications/Accessories
+Requires:       gnome-do >= %{version}
+Requires: 	tasque
+
+%description tasque
+gnome-do plugins for tasque
 
 %package vinagre
 Summary:        gnome-do-plugins for vinagre
-Summary(ja):     GNOME Do の vinagre プラグインです。
+Summary(ja):    GNOME Do の vinagre プラグインです。
 Group:          Applications/Accessories
-Requires:       gnome-do >= %{version} vinagre
+Requires:       gnome-do >= %{version}
+Requires: 	vinagre
 
 %description vinagre
 gnome-do plugins for vinagre
@@ -176,21 +209,24 @@ GNOME Do の vinagre プラグインです。
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix
-%patch1 -p0 -b .wink
-%patch2 -p0 -b .mono-2.8
-%patch3 -p0 -b .mono-2.8-sqlite
+#patch0 -p1 -b .fix
+#patch1 -p0 -b .wink
+#patch2 -p0 -b .mono-2.8
+#patch3 -p0 -b .mono-2.8-sqlite
+%patch70 -p1 -b .transmission
 
 %build
 autoreconf -f -i
+
+sed -i -e 's|dbus-sharp-1\.0|dbus-sharp-2\.0|g' configure
+sed -i -e 's|dbus-sharp-glib-1\.0|dbus-sharp-glib-2\.0|g' configure
+
 %configure \
         --disable-banshee \
-        --disable-evolution \
         --disable-flickr \
-        --disable-gcal \
-        --disable-gmail \
-        --disable-gdocs \
-        --disable-youtube
+	--disable-transmission \
+        --disable-youtube \
+	--enable-release
            
 make %{?_smp_mflags}
 
@@ -211,6 +247,10 @@ rm -rf ${RPM_BUILD_ROOT}
 #%defattr(-, root, root,-)
 #%{_libdir}/gnome-do/plugins/*Bibtex*
 
+%files chromium
+%defattr(-, root, root,-)
+%{_libdir}/gnome-do/plugins/*Chromium*
+
 #%files clawsmail
 #%defattr(-, root, root,-)
 #%{_libdir}/gnome-do/plugins/*ClawsMail*
@@ -251,9 +291,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/Thunderbird*
 
-#%files tasque
-#%defattr(-, root, root,-)
-#%{_libdir}/gnome-do/plugins/*Tasque*
+%files tasque
+%defattr(-, root, root,-)
+%{_libdir}/gnome-do/plugins/*Tasque*
 
 %files vinagre
 %defattr(-, root, root,-)
@@ -265,6 +305,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc COPYING AUTHORS COPYRIGHT
 #%exclude %{_libdir}/gnome-do/plugins/*Banshee*
 %exclude %{_libdir}/gnome-do/plugins/Bibtex*
+%exclude %{_libdir}/gnome-do/plugins/Chromium*
 %exclude %{_libdir}/gnome-do/plugins/ClawsMail*
 %exclude %{_libdir}/gnome-do/plugins/Epiphany*
 #%exclude %{_libdir}/gnome-do/plugins/*Evolution*
@@ -280,6 +321,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/gnome-do/plugins/
 
 %changelog
+* Sun Apr 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.8.5-1
+- new upstream release
+- changed BR: dbus-sharp-devel, dbus-shrap-glib-devel instead of ndesk-glib
+- added Patch70
+
 * Thu Jan 13 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.8.2.1-1
 - new upstream release
 - add Patch1 to 3: to fix build error (import from openSUSE)

+ 66 - 62
g/gnome-do/gnome-do-vl.spec

@@ -1,55 +1,52 @@
-%define	mainver		0.8.4
-%define	build_vine5	%( [ "%{?_dist_release}" == "vl5" ] && echo 1 || echo 0)
+%define	mainver		0.95.1
 
 Name:		gnome-do
-Version:	0.8.4
-Release:	3%{?_dist_release}
-Summary:	An intelligent launcher tool for Gnome
-Summary(ja):	Gnome 用の高機能ランチャー
+Version:	0.95.1
+Release:	1%{?_dist_release}
+Summary:	Quick launch and search
+Summary(ja):	高速な起動及び検索を行うランチャー
+
 License:	GPLv3+
 Group:		Applications/Accessories	
-URL:		http://do.davebsd.com/
-Source0:	http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
-Source1:	gnome-do.desktop
+URL:		http://do.cooperteam.net/
+# http://launchpad.net/do/trunk/0.95.1/+download/gnome-do-0.95.1.tar.gz
+Source0:	http://launchpad.net/do/trunk/%{mainver}/+download/gnome-do-%{version}.tar.gz
+
+#Source1:	gnome-do.desktop
 # Taken from cmigemo
 Source2:	Migemo.cs.utf8
-# https://bugs.launchpad.net/do/+bug/634556
-#Patch0:		gnome-do-0.8.3.1-mono-2.8.patch
-#Patch1:		gnome-do-0.8.3.1-gdk-build-fix.patch
-# https://bugs.launchpad.net/do/+bug/634550
-Patch2:		gnome-do-0.8.4-cs0200.patch
-# http://d.hatena.ne.jp/kiwanami/20110612/1307897291
 # https://gist.github.com/1021707, but modified for gnome-do-0.8,4
-Patch3:		gnome-do-0.8.4-cmigemo.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch3:         gnome-do-0.8.4-cmigemo.patch
 
-# Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:	ppc64
+# Vine patch
+Patch70:	gnome-do-0.95.1-avoidas.patch
 
-Requires:	cmigemo
-BuildRequires:	mono-devel, mono-addins
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:	mono-devel, mono-addins-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	ndesk-dbus
-BuildRequires:	ndesk-dbus-glib
-BuildRequires:	gtk-sharp2
+BuildRequires:	dbus-sharp-devel
+BuildRequires:	dbus-sharp-glib-devel
+BuildRequires:	gtk-sharp2-devel
 BuildRequires:	notify-sharp-devel
-BuildRequires:	gnome-sharp2, gnome-desktop-sharp2 >= 2.26
+BuildRequires:	gconf-sharp2-devel
+BuildRequires:	gnome-sharp2-devel, gnome-desktop-sharp2-devel >= 2.26
 BuildRequires:	gnome-keyring-sharp-devel
 BuildRequires:	gettext
 BuildRequires:	perl-XML-Parser
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	wnck-sharp
-BuildRequires:	gconf-sharp2
-BuildRequires:	rsvg2-sharp
+BuildRequires:  gio-sharp-devel
+BuildRequires:  gkeyfile-sharp-devel
+Requires:	cmigemo
 
 Requires(pre):	GConf2
 Requires(post): GConf2
 Requires(preun):GConf2
 
-Requires:	gnome-keyring-sharp, gnome-desktop-sharp2
-Requires:	pkgconfig
+#Requires:	gnome-keyring-sharp, gnome-desktop-sharp2
+#Requires:	gnome-desktop, pkgconfig
+#Requires:      gio-sharp, gkeyfile-sharp
 
 Packager:	kazutaka
 
@@ -70,11 +67,11 @@ GNOME Do (Do) は高機能なランチャーツールです。 PC を使った
 再生する等)を指定することができます。
 
 %package devel
-Summary:		Development files for GNOME Do
-Summary(ja):               GNOME Do の開発用ファイル
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-Requires:		pkgconfig
+Summary:	Development files for GNOME Do
+Summary(ja):    GNOME Do の開発用ファイル
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Development files for GNOME Do
@@ -84,39 +81,41 @@ GNOME Do の開発用ファイルです。
 
 %prep
 %setup -q
-#%if !%{build_vine5}
-#%patch0 -p0 -b .mono28-fix
-#%patch1 -p1 -b .gdkbuild-fix
-#%endif
-%patch2 -p0 -b .cs0200
-
 # apply cmigemo patch
 %{__cp} %{SOURCE2} Do.Platform/src/Do.Platform/Migemo.cs
 %patch3 -p1 -b .cmigemo
 
+%patch70 -p1 -b .as
+
+sed -i -e 's|dbus-sharp-1\.0|dbus-sharp-2\.0|g' configure
+sed -i -e 's|dbus-sharp-glib-1\.0|dbus-sharp-glib-2\.0|g' configure
 
 %build
-%configure
+%configure \
+    --disable-schemas-install \
+    --enable-release
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart	\
-	--add-only-show-in=GNOME				\
-	%{SOURCE1}
-desktop-file-install \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
-        --remove-category Application \
-        %{SOURCE1}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libdo.la
 
+desktop-file-install	\
+	--dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart	\
+	--add-only-show-in=GNOME				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/gnome-do.desktop
+desktop-file-install --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--remove-category Application	\
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-#own this dir:
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+#kdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/
 
 %find_lang %{name}
 
@@ -124,41 +123,41 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT
-%{_bindir}/gnome-do/
+%{_bindir}/gnome-do
 %{_libdir}/gnome-do/
-%{_datadir}/gnome-do/
+#{_datadir}/gnome-do/
 %config(noreplace) %{_sysconfdir}/xdg/autostart/gnome-do.desktop
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-do.*
@@ -169,6 +168,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Apr 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.95.1-1
+- updated to 0.95.1
+- dropt Source1
+- added Patch70
+
 * Thu Jun 23 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.8.4-3
 - update Patch2 to fix Bad quantifier error of regex
 

+ 33 - 16
g/gtksourceview-sharp2/gtksourceview-sharp2-vl.spec

@@ -1,14 +1,14 @@
-%define mono_dir %(/usr/bin/monodir)
+%define mono_dir %{_prefix}/lib/mono
 
 Name: gtksourceview-sharp2
 Summary: GtkSourceView bindings for Mono
 Summary(ja):  Mono 用 GtkSourceView バインディング
 Version: 0.12
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 
 License: LGPL
-Group: Development/Libraries
-URL: http://www.go-mono.org
+Group: System Environment/Libraries
+URL: http://www.mono-project.com/
 
 Source: http://download.mono-project.com/sources/gtksourceview-sharp-2.0/gtksourceview-sharp-2.0-%{version}.tar.bz2
 Patch0: gtksourceview-sharp2-gnome-print.patch
@@ -16,9 +16,11 @@ Patch0: gtksourceview-sharp2-gnome-print.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtksourceview-devel
-BuildRequires: gnome-sharp2 gtk-sharp2-gapi
-BuildRequires: gnome-print-sharp
-BuildRequires: mono-devel monodoc
+BuildRequires: gnome-sharp2-devel
+BuildRequires: gtk-sharp2-gapi gtk-sharp2-devel
+BuildRequires: gnome-print-sharp-devel
+BuildRequires: mono-devel
+BuildRequires: monodoc
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -28,6 +30,17 @@ This package provides Mono bindings for GtkSourceView, a child of the
 GTK+ text widget which implements syntax highlighting and other
 features typical of a source editor.
 
+%package        devel
+Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    devel
+The %{name}-devel package contains development files for %{name}.
+
+
 %prep
 %setup -q -n gtksourceview-sharp-2.0-%{version}
 %patch0 -p0 -b .gnome-print
@@ -36,12 +49,11 @@ autoreconf
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 ./configure \
-	--prefix=/usr \
-	--libdir=/usr/lib \
-	--sysconfdir=/etc \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info \
-	--localstatedir=/var
+	--prefix=%{_prefix} \
+	--libdir=%{_prefix}/lib \
+	--sysconfdir=%{_sysconfdir} \
+	--mandir=%{_mandir}
+
 make
 
 
@@ -63,15 +75,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING INSTALL NEWS README
+%doc AUTHORS COPYING NEWS README
 %{mono_dir}/gac/gtksourceview-sharp
 %{mono_dir}/gtksourceview-sharp-2.0
-%{_prefix}/lib/monodoc/sources/gtksourceview-sharp-docs*
-%{_datadir}/pkgconfig/gtksourceview-sharp-2.0.pc
 %{_datadir}/gapi-2.0/gtksourceview-api.xml
 
+%files devel
+%defattr(-, root, root)
+%{_datadir}/pkgconfig/gtksourceview-sharp-2.0.pc
+%{_prefix}/lib/monodoc/sources/gtksourceview-sharp-docs*
 
 %changelog
+* Sun Apr 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.12-7
+- split development files into devel subpackage
+
 * Sun Oct 26 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.12-6
 - moved packages to Development/Libraries Group
 - fixed Licesne to LGPL (see, COPYING)

+ 20 - 10
m/mod_mono/mod_mono-vl.spec

@@ -1,21 +1,26 @@
 %define apxs /usr/bin/apxs
 %define httpd_modulesdir %(%{apxs} -q LIBEXECDIR)
 %define httpd_sysconfdir %{_sysconfdir}/apache2/conf.d
+
 Summary: Run ASP.NET Pages on Unix with Apache and Mono
-Summary(ja): mod_mono は Apacheサーバの ASP.NET モジュールです
+Summary(ja): Apache サーバの ASP.NET モジュールです
 Name: mod_mono
-Version: 2.10
-Release: 2%{?_dist_release}
-Url: http://go-mono.com/
-Source: %{name}-%{version}.tar.bz2
-License: Apache Software License
-Group: System Environment/Daemons
+Version: 3.12
+Release: 1%{?_dist_release}
+
+License: APL 2.0
+Group: Applications/Services
+URL: http://www.mono-project.com/docs/web/mod_mono/
+
+Source: https://github.com/mono/mod_mono/archive/%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: apache2-devel
 BuildRequires: apr-devel
 BuildRequires: mono-devel
 BuildRequires: pkgconfig
-Requires: xsp >= %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: autoconf automake libtool
+Requires: xsp 
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -26,9 +31,11 @@ into Apache, run the command "a2enmod mono" as root.
 
 
 %prep
-%setup
+%setup -q 
 
 %build
+./autogen.sh
+
 %configure \
 	--with-remove-display \
 	--with-apxs=%{apxs} \
@@ -52,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Sun Apr 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.12-1
+- updated to 3.12
+
 * Mon Apr 25 2011 Shu KONNO <owa@bg.wakwak.com> 2.10-2
 - rebuilt with mono-2.10.1-3
 

+ 59 - 31
t/tasque/tasque-vl.spec

@@ -1,32 +1,44 @@
 Name:		tasque
-Version:	0.1.9
-Release:	2%{?_dist_release}
+Version:	0.1.12
+Release:	1%{?_dist_release}
 Summary:	A simple task management app
 Summary(ja):	シンプルなタスク管理アプリケーション
 
 Group:		Applications/Productivity
 License:	MIT
 URL:		http://live.gnome.org/Tasque
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/tasque/0.1/%{name}-%{version}.tar.bz2
-Source1:	tasque-0.1.9-ja.po
-Patch1:		tasque-0.1.8-smaller-font.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	intltool pkgconfig mono-core gtk-sharp2
-BuildRequires:	gnome-sharp2 ndesk-dbus ndesk-dbus-glib
-BuildRequires:	gettext desktop-file-utils mono-data-sqlite
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/tasque/0.1/%{name}-%{version}.tar.xz
+
+# Vine Patches
+Patch70:	tasque-0.1.12-dbussharp2.patch
+Patch71:	tasque-0.1.12-smaller-font.patch
+
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  dbus-sharp-devel dbus-sharp-glib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:	gettext-devel intltool pkgconfig 
+BuildRequires:	gnome-sharp2-devel
+BuildRequires:	gtk-sharp2-devel
+BuildRequires:	mono-core mono-data-sqlite mono-devel
 BuildRequires:	notify-sharp-devel
-Requires:	mono-core gnome-sharp2 gtk-sharp2 ndesk-dbus-glib mono-data-sqlite
+# to avoid autoreconf error...
+BuildRequires:	glib2-devel
+
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires:	mono-core gnome-sharp2 gtk-sharp2 mono-data-sqlite
 Requires:	notify-sharp
-#ExcludeArch:    ppc64
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
 Packager:	kazutaka
 
 %description
 Tasque is a simple task management app (TODO list) for the Linux Desktop. 
 
 %description -l ja
-Tasque は Linux デスクトップ向けのシンプルなタスク管理 (TODO
-リスト) アプリケーションです。
+Tasque は Linux デスクトップ向けのシンプルなタスク管理 (TODO リスト) アプリケーションです。
 
 %package    devel
 Summary:    Development files for tasque 
@@ -43,53 +55,69 @@ tasque の開発用ファイルです。
 
 %prep
 %setup -q
-%patch1 -p1
+%patch70 -p1 -b .dbussharp2
+%patch71 -p1 -b .smaller-font
 sed -i.nosuse -e 's|X-SuSE-Core-Office;||' data/tasque.desktop.in
-%{__cp} %{SOURCE1} po/ja.po
 
 %build
-%configure --disable-standard-backends --enable-backend-rtm --enable-backend-sqlite
+autoreconf -f -i 
+%configure --disable-appindicator
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
-%find_lang %{name}
-desktop-file-install --delete-original --vendor="vine" \
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+
+desktop-file-install --delete-original --vendor="" \
        --dir=%{buildroot}%{_datadir}/applications \
        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+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 || :
-fi
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO
 %{_bindir}/%{name}
-%{_libdir}/%{name}
+%{_prefix}/lib/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/vine-%{name}.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.Tasque.service
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/pixmaps/*
 
 %files devel
 %defattr (-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Apr 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.1.12-1
+- updated to 0.1.12
+- dropt Source1 (upsteream is newer)
+- added Patch70 to build with dbus-sharp 0.8 series
+- updated Patch1 and renumberd as Patch71
+- added BR: dbus-sharp-devel and dbus-sharp-glib-devel instead of ndesk-dbus and ndesk-dbus-glib respectively
+
 * Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 0.1.9-2
 - rebuilt with rpm-4.8.1 for pkg-config