Author: wiget Date: Fri Mar 18 19:46:13 2011 GMT Module: packages Tag: HEAD ---- Log message: - build gtk3 version too - drop libtool files - use libview widget in gtk2 version - explicity disable browser plugin (broken for now) - rel. 2
---- Files affected: packages/gtk-vnc: gtk-vnc.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: packages/gtk-vnc/gtk-vnc.spec diff -u packages/gtk-vnc/gtk-vnc.spec:1.26 packages/gtk-vnc/gtk-vnc.spec:1.27 --- packages/gtk-vnc/gtk-vnc.spec:1.26 Sat Mar 5 19:08:05 2011 +++ packages/gtk-vnc/gtk-vnc.spec Fri Mar 18 20:46:08 2011 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Widget GTK+ dla klientów VNC Name: gtk-vnc Version: 0.4.3 -Release: 1 +Release: 2 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/0.4/%{name}-%{version}.tar.bz2 @@ -12,21 +12,28 @@ URL: http://live.gnome.org/gtk-vnc BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.10 +BuildRequires: cairo-devel >= 1.2.0 BuildRequires: cyrus-sasl-devel +BuildRequires: gdk-pixbuf2-devel >= 2.10.0 BuildRequires: gettext-devel +BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gnome-common BuildRequires: gnutls-devel >= 1.4.0 BuildRequires: gobject-introspection-devel >= 0.9.4 BuildRequires: gtk+2-devel >= 2:2.18.0 +BuildRequires: gtk+3-devel >= 3.0.0 BuildRequires: intltool >= 0.40.0 -BuildRequires: libtool +BuildRequires: libtool >= 2.2.6 +BuildRequires: libview-devel >= 0.6.0 BuildRequires: perl-Text-CSV BuildRequires: perl-tools-pod BuildRequires: pkgconfig BuildRequires: python-devel >= 1:2.4 BuildRequires: python-pygtk-devel >= 2:2.0.0 BuildRequires: rpm-pythonprov +BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel +Requires: libgvnc = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -46,6 +53,7 @@ Requires: %{name} = %{version}-%{release} Requires: gnutls-devel >= 1.4.0 Requires: gtk+2-devel >= 2:2.18.0 +Requires: libgvnc-devel = %{version}-%{release} %description devel Header files for gtk-vnc library. @@ -58,6 +66,7 @@ Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Requires: libgvnc-static = %{version}-%{release} %description static Static gtk-vnc library. @@ -65,6 +74,85 @@ %description static -l pl.UTF-8 Statyczna biblioteka gtk-vnc. +%package -n gtk3-vnc +Summary: A GTK+ widget for VNC clients +Summary(pl.UTF-8): Widget GTK+ dla klientów VNC +Group: X11/Libraries +Requires: libgvnc = %{version}-%{release} + +%description -n gtk3-vnc +gtk-vnc is a VNC viewer widget for GTK+ 3.x. It is built using +coroutines allowing it to be completely asynchronous while remaining +single threaded. + +%description -n gtk3-vnc -l pl.UTF-8 +gtk-vnc to widget przeglądarki VNC dla GTK+ 3.x. Jest skonstruowany z +użyciem korutyn, dzięki czemu mogą być w pełni asynchroniczne +pozostając jednowątkowymi. + +%package -n gtk3-vnc-devel +Summary: Header files for gtk-vnc library - GTK+ 3.x version +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gtk-vnc - wersja dla GTK+ 3.x +Group: X11/Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gnutls-devel >= 1.4.0 +Requires: gtk+3-devel >= 3.0.0 +Requires: libgvnc-devel = %{version}-%{release} + +%description -n gtk3-vnc-devel +Header files for gtk-vnc library - GTK+ 3.x version. + +%description -n gtk3-vnc-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki gtk-vnc - wersja dla GTK+ 3.x. + +%package -n gtk3-vnc-static +Summary: Static gtk-vnc library - GTK+ 3.x version +Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc - wersja dla GTK+ 3.x +Group: X11/Development/Libraries +Requires: gtk3-vnc-devel = %{version}-%{release} +Requires: libgvnc-static = %{version}-%{release} + +%description -n gtk3-vnc-static +Static gtk-vnc library - GTK+ 3.x version. + +%description -n gtk3-vnc-static -l pl.UTF-8 +Statyczna biblioteka gtk-vnc - wersja dla GTK+ 3.x. + +%package -n libgvnc +Summary: A library for VNC clients +Summary(pl.UTF-8): Biblioteka dla klientów VNC +Group: X11/Libraries + +%description -n libgvnc +A library for VNC clients. + +%description -n libgvnc -l pl.UTF-8 +Biblioteka dla klientów VNC. + +%package -n libgvnc-devel +Summary: Header files for libgvnc library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libgvnc +Group: X11/Development/Libraries +Requires: libgvnc = %{version}-%{release} + +%description -n libgvnc-devel +Header files for libgvnc library. + +%description -n libgvnc-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki libgvnc. + +%package -n libgvnc-static +Summary: Static libgvnc library +Summary(pl.UTF-8): Statyczna biblioteka libgvnc +Group: X11/Development/Libraries +Requires: libgvnc-devel = %{version}-%{release} + +%description -n libgvnc-static +Static libgvnc library. + +%description -n libgvnc-static -l pl.UTF-8 +Statyczna biblioteka libgvnc. + %package -n python-gtk-vnc Summary: Python bindings for the gtk-vnc library Summary(pl.UTF-8): Wiązania Pythona do biblioteki gtk-vnc @@ -100,16 +188,38 @@ %{__autoconf} %{__autoheader} %{__automake} -%configure \ +# force enums regeneration +touch src/vncconnection.h src/vncdisplay.h +mkdir gtk{2,3} +cd gtk2 +../%configure \ + --with-gtk=2.0 \ + --with-libview \ + --enable-static \ + --disable-plugin \ + --disable-silent-rules +%{__make} +cd ../gtk3 +# libview not ported to gtk+3 +../%configure \ + --with-gtk=3.0 \ + --without-libview \ --enable-static \ + --disable-plugin \ --disable-silent-rules %{__make} +cd .. %install rm -rf $RPM_BUILD_ROOT +cd gtk2 %{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT +cd ../gtk3 +%{__make} -j1 install \ + DESTDIR=$RPM_BUILD_ROOT +cd .. install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version} @@ -117,7 +227,8 @@ install examples/gvncviewer.{c,js} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} install examples/gvncviewer.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version} -rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} \ + $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} @@ -127,33 +238,57 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{name}.lang +%files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_libdir}/libgtk-vnc-1.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgtk-vnc-1.0.so.0 -%attr(755,root,root) %{_libdir}/libgvnc-1.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgvnc-1.0.so.0 -%{_libdir}/girepository-1.0/GVnc-1.0.typelib %{_libdir}/girepository-1.0/GtkVnc-1.0.typelib %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgtk-vnc-1.0.so -%attr(755,root,root) %{_libdir}/libgvnc-1.0.so -%{_libdir}/libgtk-vnc-1.0.la -%{_libdir}/libgvnc-1.0.la %{_includedir}/%{name}-1.0 -%{_includedir}/gvnc-1.0 -%{_datadir}/gir-1.0/GVnc-1.0.gir %{_datadir}/gir-1.0/GtkVnc-1.0.gir %{_pkgconfigdir}/%{name}-1.0.pc -%{_pkgconfigdir}/gvnc-1.0.pc %{_examplesdir}/%{name}-%{version} %files static %defattr(644,root,root,755) %{_libdir}/libgtk-vnc-1.0.a + +%files -n gtk3-vnc +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgtk-vnc-2.0.so.0 +%attr(755,root,root) %{_libdir}/libgtk-vnc-2.0.so.0.0.2 +%{_libdir}/girepository-1.0/GtkVnc-2.0.typelib + +%files -n gtk3-vnc-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgtk-vnc-2.0.so +%{_includedir}/gtk-vnc-2.0 +%{_pkgconfigdir}/gtk-vnc-2.0.pc +%{_datadir}/gir-1.0/GtkVnc-2.0.gir + +%files -n gtk3-vnc-static +%defattr(644,root,root,755) +%{_libdir}/libgtk-vnc-2.0.a + +%files -n libgvnc -f %{name}.lang +%defattr(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README +%attr(755,root,root) %{_libdir}/libgvnc-1.0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgvnc-1.0.so.0 +%{_libdir}/girepository-1.0/GVnc-1.0.typelib + +%files -n libgvnc-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgvnc-1.0.so +%{_datadir}/gir-1.0/GVnc-1.0.gir +%{_includedir}/gvnc-1.0 +%{_pkgconfigdir}/gvnc-1.0.pc + +%files -n libgvnc-static +%defattr(644,root,root,755) %{_libdir}/libgvnc-1.0.a %files -n python-gtk-vnc @@ -172,6 +307,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2011/03/18 19:46:08 wiget +- build gtk3 version too +- drop libtool files +- use libview widget in gtk2 version +- explicity disable browser plugin (broken for now) +- rel. 2 + Revision 1.26 2011/03/05 18:08:05 caleb - Up to 0.4.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk-vnc/gtk-vnc.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
