Author: qboosh Date: Thu Jun 16 15:00:11 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- grouped subpackages by library version
- moved utempter dependency to -common
- removed gnome-common BR (needed only to run autogen.sh, which we don't use)
- unified library descriptions, note GTK+ version everywhere
---- Files affected:
packages/vte:
vte.spec (1.166 -> 1.167)
---- Diffs:
================================================================
Index: packages/vte/vte.spec
diff -u packages/vte/vte.spec:1.166 packages/vte/vte.spec:1.167
--- packages/vte/vte.spec:1.166 Wed Jun 15 16:53:32 2011
+++ packages/vte/vte.spec Thu Jun 16 17:00:06 2011
@@ -13,7 +13,6 @@
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.28.0
-BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk+2-devel >= 2:2.14.0
BuildRequires: gtk+3-devel >= 3.0.0
@@ -26,7 +25,6 @@
BuildRequires: python-pygtk-devel >= 2:2.12.0
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.592
-Requires(pre): utempter
Requires: %{name}-common = %{version}-%{release}
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
@@ -37,33 +35,24 @@
gnome-terminal among other programs.
%description -l pl.UTF-8
-Ten pakiet zawiera kontrolkę terminala dla GTK+ 3.x. Jest używany przez
-gnome-terminal oraz inne programy.
-
-%package -n vte0
-Summary: VTE terminal widget library
-Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE
-Group: X11/Libraries
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n vte0
-The vte package contains a terminal widget for GTK+ 2.x. It's used by
-gnome-terminal among other programs.
-
-%description -n vte0 -l pl.UTF-8
-Ten pakiet zawiera kontrolkę terminala dla GTK+ 2.x. Jest używany przez
-gnome-terminal oraz inne programy.
+Ten pakiet zawiera kontrolkę terminala dla GTK+ 3.x. Jest używany
+przez gnome-terminal oraz inne programy.
%package common
Summary: Common files for vte and vte0
+Summary(pl.UTF-8): Pliki wspólne dla vte i vte0
Group: X11/Libraries
+Requires(pre): utempter
%description common
-Common files for vte and vte0.
+Common files for GTK+ 3 based vte and GTK+ 2 based vte0.
+
+%description common -l pl.UTF-8
+Pliki wspólne dla vte opartego na GTK+ 3 oraz vte0 opartego na GTK+ 2.
%package devel
-Summary: Headers for VTE
-Summary(pl.UTF-8): Pliki nagłówkowe VTE
+Summary: Header files for VTE for GTK+ 3
+Summary(pl.UTF-8): Pliki nagłówkowe VTE dla GTK+ 3
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= 1:2.28.0
@@ -72,19 +61,54 @@
Conflicts: gnome-libs-devel < 1.4.1.2
%description devel
-The vte package contains a terminal widget for GTK+ 3.x. It's used by
-gnome-terminal among other programs.
-
-You should install the vte-devel package if you would like to compile
-applications that use the vte terminal widget. You do not need to
-install vte-devel if you just want to use precompiled applications.
+This package contains header files for GTK+ 3 based vte library.
%description devel -l pl.UTF-8
-Pliki nagłówkowe potrzebne do kompilowania programów używających vte.
+Pliki nagłówkowe potrzebne do kompilowania programów używających
+biblioteki vte opartej na GTK+ 3.
+
+%package static
+Summary: Static VTE library for GTK+ 3
+Summary(pl.UTF-8): Statyczna biblioteka VTE dla GTK+ 3
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Conflicts: gnome-libs-static < 1.4.1.2
+
+%description static
+Static version of VTE library for GTK+ 3.
+
+%description static -l pl.UTF-8
+Statyczna wersja biblioteki VTE dla GTK+ 3.
+
+%package apidocs
+Summary: VTE API documentation (GTK+ 3 version)
+Summary(pl.UTF-8): Dokumentacja API VTE (wersja dla GTK+ 3)
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+VTE API documentation (GTK+ 3 version).
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API VTE (wersja dla GTK+ 3).
+
+%package -n vte0
+Summary: VTE terminal widget library for GTK+ 2
+Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE dla GTK+ 2
+Group: X11/Libraries
+Requires: %{name}-common = %{version}-%{release}
+
+%description -n vte0
+The vte package contains a terminal widget for GTK+ 2.x. It's used by
+gnome-terminal among other programs.
+
+%description -n vte0 -l pl.UTF-8
+Ten pakiet zawiera kontrolkę terminala dla GTK+ 2.x. Jest używany
+przez gnome-terminal oraz inne programy.
%package -n vte0-devel
-Summary: Headers for VTE
-Summary(pl.UTF-8): Pliki nagłówkowe VTE
+Summary: Header files for VTE for GTK+ 2
+Summary(pl.UTF-8): Pliki nagłówkowe VTE dla GTK+ 2
Group: X11/Development/Libraries
Requires: vte0 = %{version}-%{release}
Requires: glib2-devel >= 1:2.28.0
@@ -93,41 +117,36 @@
Conflicts: gnome-libs-devel < 1.4.1.2
%description -n vte0-devel
-The vte package contains a terminal widget for GTK+ 2.x. It's used by
-gnome-terminal among other programs.
-
-You should install the vte-devel package if you would like to compile
-applications that use the vte terminal widget. You do not need to
-install vte-devel if you just want to use precompiled applications.
+This package contains header files for GTK+ 2 based vte library.
%description -n vte0-devel -l pl.UTF-8
-Pliki nagłówkowe potrzebne do kompilowania programów używających vte.
-
-%package static
-Summary: Static VTE library
-Summary(pl.UTF-8): Statyczna biblioteka VTE
-Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Conflicts: gnome-libs-static < 1.4.1.2
-
-%description static
-Static version of VTE libraries.
-
-%description static -l pl.UTF-8
-Statyczna wersja bibliotek VTE.
+Pliki nagłówkowe potrzebne do kompilowania programów używających
+biblioteki vte opartej na GTK+ 2.
%package -n vte0-static
-Summary: Static VTE library - GTK+ 2.x version
-Summary(pl.UTF-8): Statyczna biblioteka VTE - wersja dla GTK+ 2.x
+Summary: Static VTE library for GTK+ 2
+Summary(pl.UTF-8): Statyczna biblioteka VTE dla GTK+ 2
Group: X11/Development/Libraries
Requires: vte0-devel = %{version}-%{release}
Conflicts: gnome-libs-static < 1.4.1.2
%description -n vte0-static
-Static version of VTE libraries - GTK+ 2.x version.
+Static version of VTE library for GTK+ 2.
%description -n vte0-static -l pl.UTF-8
-Statyczna wersja bibliotek VTE - wersja dla GTK+ 2.x.
+Statyczna wersja biblioteki VTE dla GTK+ 2.
+
+%package -n vte0-apidocs
+Summary: VTE API documentation - GTK+ 2.x version
+Summary(pl.UTF-8): Dokumentacja API VTE - wersja dla GTK+ 2.x
+Group: Documentation
+Requires: gtk-doc-common
+
+%description -n vte0-apidocs
+VTE API documentation - GTK+ 2.x version.
+
+%description -n vte0-apidocs -l pl.UTF-8
+Dokumentacja API VTE - wersja dla GTK+ 2.x.
%package -n python-vte
Summary: Python VTE module
@@ -156,30 +175,6 @@
%description -n python-vte-devel -l pl.UTF-8
Pliki programistyczne wiązań Pythona do VTE.
-%package apidocs
-Summary: VTE API documentation
-Summary(pl.UTF-8): Dokumentacja API VTE
-Group: Documentation
-Requires: gtk-doc-common
-
-%description apidocs
-VTE API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API VTE.
-
-%package -n vte0-apidocs
-Summary: VTE API documentation - GTK+ 2.x version
-Summary(pl.UTF-8): Dokumentacja API VTE - wersja dla GTK+ 2.x
-Group: Documentation
-Requires: gtk-doc-common
-
-%description -n vte0-apidocs
-VTE API documentation - GTK+ 2.x version.
-
-%description -n vte0-apidocs -l pl.UTF-8
-Dokumentacja API VTE - wersja dla GTK+ 2.x.
-
%prep
%setup -q
@@ -221,13 +216,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-cd gtk2
-%{__make} install \
+%{__make} -C gtk2 install \
DESTDIR=$RPM_BUILD_ROOT
-cd ../gtk3
-%{__make} install \
+%{__make} -C gtk3 install \
DESTDIR=$RPM_BUILD_ROOT
-cd ..
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
$RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/vtemodule.{la,a}
@@ -241,7 +233,7 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n vte0 -p /sbin/ldconfig
+%post -n vte0 -p /sbin/ldconfig
%postun -n vte0 -p /sbin/ldconfig
%files -f vte-2.90.lang
@@ -251,13 +243,6 @@
%attr(755,root,root) %ghost %{_libdir}/libvte2_90.so.9
%{_libdir}/girepository-1.0/Vte-2.90.typelib
-%files -n vte0 -f vte-0.0.lang
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vte
-%attr(755,root,root) %{_libdir}/libvte.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvte.so.9
-%{_libdir}/girepository-1.0/Vte-0.0.typelib
-
%files common
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
@@ -271,6 +256,21 @@
%{_pkgconfigdir}/vte-2.90.pc
%{_datadir}/gir-1.0/Vte-2.90.gir
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libvte2_90.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/vte-2.90
+
+%files -n vte0 -f vte-0.0.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vte
+%attr(755,root,root) %{_libdir}/libvte.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvte.so.9
+%{_libdir}/girepository-1.0/Vte-0.0.typelib
+
%files -n vte0-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libvte.so
@@ -278,37 +278,35 @@
%{_pkgconfigdir}/vte.pc
%{_datadir}/gir-1.0/Vte-0.0.gir
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libvte2_90.a
-
%files -n vte0-static
%defattr(644,root,root,755)
%{_libdir}/libvte.a
+%files -n vte0-apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/vte-0.0
+
%files -n python-vte
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/gtk-2.0/vtemodule.so
%files -n python-vte-devel
%defattr(644,root,root,755)
-%{_datadir}/pygtk/2.0/defs/*.defs
+%{_datadir}/pygtk/2.0/defs/vte.defs
%{_pkgconfigdir}/pyvte.pc
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/vte-2.90
-
-%files -n vte0-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/vte-0.0
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedb...@pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.167 2011/06/16 15:00:06 qboosh
+- grouped subpackages by library version
+- moved utempter dependency to -common
+- removed gnome-common BR (needed only to run autogen.sh, which we don't use)
+- unified library descriptions, note GTK+ version everywhere
+
Revision 1.166 2011/06/15 14:53:32 kiesiu
- updated to 0.28.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vte/vte.spec?r1=1.166&r2=1.167&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
