packages: vinagre/vinagre.spec - updated to 3.0.0; merged from DEVEL

megabajt megabajt at pld-linux.org
Thu Apr 7 14:39:59 CEST 2011 

Author: megabajt                     Date: Thu Apr  7 12:39:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/vinagre:
   vinagre.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/vinagre/vinagre.spec
diff -u packages/vinagre/vinagre.spec:1.21 packages/vinagre/vinagre.spec:1.22
--- packages/vinagre/vinagre.spec:1.21	Fri Feb  4 19:24:07 2011
+++ packages/vinagre/vinagre.spec	Thu Apr  7 14:39:54 2011
@@ -2,44 +2,47 @@
 Summary:	VNC client for the GNOME desktop
 Summary(pl.UTF-8):	Klient VNC dla środowiska GNOME
 Name:		vinagre
-Version:	2.30.3
-Release:	2
+Version:	3.0.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/vinagre/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	adfa70f0fab9171d01f4c4cd4ede9e90
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/vinagre/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	5d1b06d21afb90c1b03b238bcfde968a
 URL:		http://www.gnome.org/projects/vinagre/
-BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.10
-BuildRequires:	avahi-devel >= 0.6.22
-BuildRequires:	avahi-glib-devel >= 0.6.22
-BuildRequires:	avahi-gobject-devel >= 0.6.22
-BuildRequires:	avahi-ui-devel >= 0.6.22
-BuildRequires:	dbus-glib-devel
+BuildRequires:	automake >= 1:1.11.1
+BuildRequires:	avahi-gobject-devel >= 0.6.26
+BuildRequires:	avahi-ui-gtk3-devel >= 0.6.26
 BuildRequires:	docbook-dtd43-xml
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	glib2-devel >= 1:2.28.0
 BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-panel-devel >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.18.0
-BuildRequires:	gtk-vnc-devel >= 0.3.10
+# applet broken for now
+BuildRequires:	gnome-panel-devel >= 2.91.91
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk+3-devel >= 3.0.3
+BuildRequires:	gtk3-vnc-devel >= 0.4.3
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libgnome-keyring-devel >= 2.24.0
-BuildRequires:	libtool
+BuildRequires:	libpeas-devel >= 1.0.0
+BuildRequires:	libpeas-gtk-devel >= 1.0.0
+BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	perl-XML-Parser
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 0.16
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	telepathy-glib-devel >= 0.7.31
-BuildRequires:	vte-devel >= 0.20.0
+#BuildRequires:	spice-slient-gtk-3.0 >= 0.5
+BuildRequires:	telepathy-glib-devel >= 0.12.0
+BuildRequires:	vte-devel >= 0.28.0
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	shared-mime-info
-Requires(post,preun):	GConf2
+Requires:	hicolor-icon-theme
+# for im status plugin
+Requires:	libpeas-loader-seed >= 1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,11 +51,19 @@
 %description -l pl.UTF-8
 Vinagre to klient VNC dla środowiska graficznego GNOME.
 
+%package -n gnome-applet-vinagre
+Summary:	Vinagre applet for gnome-panel
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description -n gnome-applet-vinagre
+Vinagre applet for gnome-panel.
+
 %package devel
 Summary:	Header files for vinagre
 Summary(pl.UTF-8):	Pliki nagłówkowe dla vinagre
 Group:		Development/Libraries
-Requires:	gtk+2-devel >= 2:2.18.0
+Requires:	gtk+3-devel >= 3.0.3
 Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
@@ -64,9 +75,6 @@
 %prep
 %setup -q
 
-%{__sed} -i -e 's/en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
-
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -75,22 +83,23 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-avahi \
+	--with-telepathy \
+	--with-panelapplet \
+	--enable-introspection \
+	--disable-spice \
 	--disable-silent-rules \
-	--enable-avahi=yes
+	--disable-scrollkeeper \
+	--disable-schemas-compile
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/vinagre-1/{plugin-loaders,plugins}/*.la
-
-# Remove text files installed by vinagre, we install them in a versioned
-# directory in the files section
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/vinagre
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/vinagre-3.0/plugins/*.la
 
 %find_lang vinagre --with-gnome --with-omf
 
@@ -98,15 +107,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install vinagre.schemas
+%glib_compile_schemas
 %update_desktop_database_post
 %update_mime_database
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall vinagre.schemas
-
 %postun
+%glib_compile_schemas
 %update_desktop_database_postun
 %update_mime_database
 %update_icon_cache hicolor
@@ -115,29 +122,37 @@
 %defattr(644,root,root,755)
 %doc README NEWS COPYING AUTHORS
 %attr(755,root,root) %{_bindir}/vinagre
-%dir %{_libdir}/vinagre-1
-%dir %{_libdir}/vinagre-1/plugin-loaders
-%attr(755,root,root) %{_libdir}/vinagre-1/plugin-loaders/libcloader.so
-%dir %{_libdir}/vinagre-1/plugins
-%attr(755,root,root) %{_libdir}/vinagre-1/plugins/libvnc.so
-%{_libdir}/vinagre-1/plugins/vnc.vinagre-plugin
-%attr(755,root,root) %{_libexecdir}/vinagre-applet
+%dir %{_libdir}/vinagre-3.0
+%dir %{_libdir}/vinagre-3.0/girepository-1.0
+%{_libdir}/vinagre-3.0/girepository-1.0/Vinagre-3.0.typelib
+%dir %{_libdir}/vinagre-3.0/plugins
+%attr(755,root,root) %{_libdir}/vinagre-3.0/plugins/libvnc.so
+%attr(755,root,root) %{_libdir}/vinagre-3.0/plugins/libreversevnc.so
+%{_libdir}/vinagre-3.0/plugins/vnc.plugin
+%{_libdir}/vinagre-3.0/plugins/im-status.plugin
+%{_libdir}/vinagre-3.0/plugins/im-status.js
+%{_libdir}/vinagre-3.0/plugins/reverse-vnc.plugin
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_desktopdir}/*.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
+%{_datadir}/glib-2.0/schemas/org.gnome.Vinagre.gschema.xml
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/telepathy/clients/Vinagre.client
 %{_datadir}/vinagre
-%{_datadir}/vinagre-1
-%{_sysconfdir}/gconf/schemas/vinagre.schemas
+%{_datadir}/vinagre-3.0
 %{_mandir}/man1/*.1*
-%{_libdir}/bonobo/servers/GNOME_VinagreApplet.server
+
+%files -n gnome-applet-vinagre
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/vinagre-applet
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.Vinagre.service
+%{_datadir}/gnome-panel/4.0/applets/org.gnome.panel.Vinagre.panel-applet
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/vinagre-1.0
-%{_pkgconfigdir}/vinagre-1.0.pc
+%{_includedir}/vinagre-3.0
+%{_pkgconfigdir}/vinagre-3.0.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -145,6 +160,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/04/07 12:39:54  megabajt
+- updated to 3.0.0; merged from DEVEL
+
+Revision 1.21.2.4  2011/04/03 20:47:26  wiget
+- up to 2.91.93
+
+Revision 1.21.2.3  2011/03/22 23:39:13  wiget
+- up to 2.91.92
+- add gnome-applet-vinagre subpackage
+
+Revision 1.21.2.2  2011/03/18 20:20:30  wiget
+- im-status plugins requires libpeas-loader-seed
+
+Revision 1.21.2.1  2011/03/18 20:16:18  wiget
+- up to 2.91.91
+
 Revision 1.21  2011/02/04 18:24:07  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vinagre/vinagre.spec?r1=1.21&r2=1.22&f=u

More information about the pld-cvs-commit mailing list