- Use the default value from configure.ac for --with-xfile-search-path

except with %{_datadir} instead of $(libdir), so Xt can search for
    app-default files as usual.
- Move the --with-xfile-search-path outside the with_static condition.
This commit is contained in:
Kristian Høgsberg 2005-12-02 18:31:21 +00:00
parent ea5a92bab1
commit a6f64803ce

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libXt runtime library Summary: X.Org X11 libXt runtime library
Name: libXt Name: libXt
Version: 0.99.2 Version: 0.99.2
Release: 2 Release: 3
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
@ -50,8 +50,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \ %configure \
%if ! %{with_static} %if ! %{with_static}
--disable-static \ --disable-static \
--with-xfile-search-path=%{_datadir}/X11/app-defaults
%endif %endif
--with-xfile-search-path="%{_sysconfdir}/X11/%%L/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%l/%%T/\%%N%%C%%S:%{_sysconfdir}/X11/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%L/%%T/%%N%%S:%{_sysconfdir}/X\11/%%l/%%T/%%N%%S:%{_sysconfdir}/X11/%%T/%%N%%S:%{_datadir}/X11/%%L/%%T/%%N%%C%%S:%{_datadir}/X1\1/%%l/%%T/%%N%%C%%S:%{_datadir}/X11/%%T/%%N%%C%%S:%{_datadir}/X11/%%L/%%T/%%N%%S:%{_datadir}/X11/%%\l/%%T/%%N%%S:%{_datadir}/X11/%%T/%%N%%S"
make make
%install %install
@ -124,6 +125,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3x/*.3x* %{_mandir}/man3x/*.3x*
%changelog %changelog
* Fri Dec 2 2005 Kristian Høgsberg <krh@redhat.com> 0.99.2-3
- Use the default value from configure.ac for --with-xfile-search-path
except with %%{_datadir} instead of $(libdir), so Xt can search for
app-default files as usual.
- Move the --with-xfile-search-path outside the with_static condition.
* Tue Nov 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2 * Tue Nov 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
- Invoke ./configure --with-xfile-search-path=%%{_datadir}/X11/app-defaults - Invoke ./configure --with-xfile-search-path=%%{_datadir}/X11/app-defaults
to make sure Xt is looking in the right place for app-defaults files. to make sure Xt is looking in the right place for app-defaults files.