From ee2f5ceaffe647eef1960086379d1e64401589e7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 18 Apr 2006 15:49:04 +0000 Subject: [PATCH] auto-import zenity-2.14.1-4 on branch devel from zenity-2.14.1-4.src.rpm --- .cvsignore | 1 + sources | 1 + zenity-2.14.0-x.patch | 42 +++++++++++++++++++++++ zenity.spec | 77 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 zenity-2.14.0-x.patch create mode 100644 zenity.spec diff --git a/.cvsignore b/.cvsignore index e69de29..756f498 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zenity-2.14.1.tar.bz2 diff --git a/sources b/sources index e69de29..8dde3dd 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2445b652a93581436164cb6ad5e9c36b zenity-2.14.1.tar.bz2 diff --git a/zenity-2.14.0-x.patch b/zenity-2.14.0-x.patch new file mode 100644 index 0000000..bb87fd0 --- /dev/null +++ b/zenity-2.14.0-x.patch @@ -0,0 +1,42 @@ +--- zenity-2.14.0/configure.in.x 2006-04-11 11:37:09.000000000 -0400 ++++ zenity-2.14.0/configure.in 2006-04-11 11:37:47.000000000 -0400 +@@ -26,38 +26,7 @@ + AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) + fi + +-dnl *********************************************** +-dnl X development libraries check +-dnl *********************************************** +- +-# +-# If Pango included the shared library dependencies from X11 in +-# the pkg-config output, then we use that (to avoid duplicates). +-# but if they were omitted to avoid binary compatibility problems +-# then we need to repeat the checks. +-# +-if $PKG_CONFIG --exists pangoxft ; then +- PANGO_PACKAGES="pangox pangoxft" +-else +- PANGO_PACKAGES="pangox" +-fi +- +-x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" +-case x_libs in +- *-lX11*) pango_omitted_x_deps=no ;; +- *) pango_omitted_x_deps=yes ;; +-esac +- +-if test $pango_omitted_x_deps = yes ; then +- AC_PATH_XTRA +- +- if test x$no_x = xyes ; then +- AC_MSG_ERROR([X development libraries not found]) +- else +- X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" +- fi +-fi +- ++X_LIBS= + AC_SUBST(X_LIBS) + + dnl ******************************* diff --git a/zenity.spec b/zenity.spec new file mode 100644 index 0000000..ff9f407 --- /dev/null +++ b/zenity.spec @@ -0,0 +1,77 @@ +Name: zenity +Version: 2.14.1 +Release: 4 +Summary: Display dialog boxes from shell scripts +Group: Applications/System +License: GPL +URL: http://directory.fsf.org/zenity.html +Source0: http://ftp.gnome.org/pub/GNOME/sources/zenity/2.14/zenity-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gnome-doc-utils >= 0.3.2 +BuildRequires: glib2-devel >= 2.7.3 +BuildRequires: gtk2-devel >= 2.6.0 +BuildRequires: libglade2-devel +BuildRequires: libgnomecanvas-devel +BuildRequires: scrollkeeper +BuildRequires: which +BuildRequires: autoconf + +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + +Patch0: zenity-2.14.0-x.patch + +%description +Zenity lets you display Gtk+ dialog boxes from the command line and through +shell scripts. It is similar to gdialog, but is intended to be saner. It comes +from the same family as dialog, Xdialog, and cdialog. + +%prep +%setup -q +%patch0 -p1 -b .x + +%build +autoconf +%configure --disable-scrollkeeper +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang zenity-0.1 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +scrollkeeper-update -q + + +%postun +scrollkeeper-update -q + + +%files -f zenity-0.1.lang +%defattr(-,root,root,-) +%{_bindir}/gdialog +%{_bindir}/zenity +%{_datadir}/zenity +%{_datadir}/gnome/help/zenity +%{_datadir}/man/man1/zenity.1.gz +%{_datadir}/omf/zenity + + +%changelog +* Tue Apr 18 2006 Matthias Clasen 2.14.1-4 +- More package review feedback + +* Mon Apr 17 2006 Matthias Clasen 2.14.1-3 +- Incorporate package review feedback + +* Tue Apr 11 2006 Matthias Clasen 2.14.1-2 +- Initial revision