diff --git a/libXt.spec b/libXt.spec index 7446214..24e964a 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,8 +1,8 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.0.4 -Release: 3%{?dist} -License: MIT/X11 +Release: 4%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -11,13 +11,10 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Patch0: libXt-1.0.2-libsm-fix.patch -BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libSM-devel -Obsoletes: XFree86-libs, xorg-x11-libs - %description X.Org X11 libXt runtime library @@ -28,12 +25,10 @@ Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} # needed by xt.pc -Requires: xorg-x11-proto-devel +Requires: xorg-x11-proto-devel pkgconfig Requires: libX11-devel Requires: libSM-devel -Obsoletes: XFree86-devel, xorg-x11-devel - %description devel X.Org X11 libXt development package @@ -50,11 +45,11 @@ X.Org X11 libXt development package export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ %if ! %{with_static} - --disable-static \ + --disable-static \ %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" + --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 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -75,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog NEWS +%doc COPYING ChangeLog %{_libdir}/libXt.so.6 %{_libdir}/libXt.so.6.0.0 %dir %{_datadir}/X11/app-defaults @@ -131,6 +126,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Jan 15 2008 parag - 1.0.4-4 +- Merge-Review #226090 +- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes +- Removed BR:pkgconfig +- Removed zero-length README AUTHORS NEWS file + * Tue Aug 21 2007 Adam Jackson - 1.0.4-3 - Rebuild for build id