[master] Remove the last references to tzmapdata

Vratislav Podzimek vpodzime at redhat.com
Tue Oct 7 15:52:15 UTC 2014


On Tue, 2014-10-07 at 11:35 -0400, David Shea wrote:
> ---
>  anaconda.spec.in        | 1 -
>  widgets/src/Makefile.am | 4 +---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/anaconda.spec.in b/anaconda.spec.in
> index ccb712f..d63282c 100644
> --- a/anaconda.spec.in
> +++ b/anaconda.spec.in
> @@ -268,7 +268,6 @@ update-desktop-database &> /dev/null || :
>  %{_sbindir}/anaconda
>  %{_sbindir}/handle-sshpw
>  %{_datadir}/anaconda
> -%exclude %{_datadir}/anaconda/tzmapdata
>  %{_prefix}/libexec/anaconda
>  %{_libdir}/python*/site-packages/pyanaconda/*
>  %exclude %{_libdir}/python*/site-packages/pyanaconda/rescue.py*
> diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am
> index 42615c2..f6584dd 100644
> --- a/widgets/src/Makefile.am
> +++ b/widgets/src/Makefile.am
> @@ -56,14 +56,12 @@ SOURCES = $(GISOURCES) $(NONGISOURCES)
>  HDRS = $(GIHDRS) $(NONGIHDRS)
>  
>  WIDGETSDATA = '"$(datadir)/anaconda"'
> -TZMAPDATA = '"tzmapdata"'
>  
>  noinst_HEADERS = gettext.h intl.h
>  
>  lib_LTLIBRARIES = libAnacondaWidgets.la
>  libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFLAGS) -Wall -g\
> -			       -DWIDGETS_DATADIR=$(WIDGETSDATA)\
> -			       -DTZMAP_DATADIR=$(TZMAPDATA)
> +			       -DWIDGETS_DATADIR=$(WIDGETSDATA)
>  libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS)
>  libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 3:0:1
>  libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list