rpms/zenity
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix upgrade path

Browse Source
This commit is contained in:
Matthias Clasen 2008-01-20 20:01:04 +00:00
parent d6d9d9a600
commit ef79988ca4
2 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
zenity-2.14.0-x.patch
View File

@ -1,42 +0,0 @@
--- 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 *******************************

5
zenity.spec
View File

@ -1,6 +1,6 @@
Name: zenity Name: zenity
Version: 2.20.1 Version: 2.20.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Display dialog boxes from shell scripts Summary: Display dialog boxes from shell scripts
Group: Applications/System Group: Applications/System
License: LGPLv2+ License: LGPLv2+
@ -71,6 +71,9 @@ scrollkeeper-update -q || :
%changelog %changelog
* Sun Jan 20 2008 Matthias Clasen <mclasen@redhat.com> - 2.20.1-2
- Rebuild to fix upgrade path
* Tue Nov 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-1 * Tue Nov 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-1
- Update to 2.20.1 (translation updates) - Update to 2.20.1 (translation updates)