# HG changeset patch # User Michael Schloh von Bennewitz # Date 1304862385 -7200 # Node ID 94a28e1a8def7fa7ac121b94639f81e5502d960b # Parent 97b3fdd21342a511be6e4c4c93ec2317d56f7306 Import package vendor original specs for necessary manipulations. diff -r 97b3fdd21342 -r 94a28e1a8def xorg-x11-libXt/app-defaults.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xorg-x11-libXt/app-defaults.diff Sun May 08 15:46:25 2011 +0200 @@ -0,0 +1,11 @@ +--- configure.ac.orig 2006-07-25 13:24:52.000000000 +0200 ++++ configure.ac 2006-07-25 13:33:02.000000000 +0200 +@@ -62,7 +62,7 @@ + fi + + # Replaces XFileSearchPathDefault from Imake configs +-XFILESEARCHPATHDEFAULT='$(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)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%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:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S' ++XFILESEARCHPATHDEFAULT='$(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)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%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:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S:/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S' + + AC_ARG_WITH(xfile-search-path, + AC_HELP_STRING([--with-xfile-search-path=], diff -r 97b3fdd21342 -r 94a28e1a8def xorg-x11-libXt/baselibs.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xorg-x11-libXt/baselibs.conf Sun May 08 15:46:25 2011 +0200 @@ -0,0 +1,2 @@ +xorg-x11-libXt +xorg-x11-libXt-devel diff -r 97b3fdd21342 -r 94a28e1a8def xorg-x11-libXt/libXt.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xorg-x11-libXt/libXt.diff Sun May 08 15:46:25 2011 +0200 @@ -0,0 +1,22 @@ +diff -u -r -p ../libXt-1.0.6.orig//src/Makefile.am ./src/Makefile.am +--- ../libXt-1.0.6.orig//src/Makefile.am 2009-11-14 02:08:08.000000000 +0000 ++++ ./src/Makefile.am 2009-11-14 02:08:22.000000000 +0000 +@@ -4,7 +4,7 @@ BUILT_SOURCES = $(BUILT_FILES) + CLEANFILES = $(BUILT_SOURCES) + + SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\" +-ERRORDB_DEFINES = -DERRORDB=\"$(libdir)/X11/XtErrorDB\" ++ERRORDB_DEFINES = -DERRORDB=\"/usr/share/X11/XtErrorDB\" + + AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \ + $(XTMALLOC_ZERO_CFLAGS) +diff -u -r -p ../libXt-1.0.6.orig//xt.pc.in ./xt.pc.in +--- ../libXt-1.0.6.orig//xt.pc.in 2009-11-14 02:08:08.000000000 +0000 ++++ ./xt.pc.in 2009-11-14 02:08:22.000000000 +0000 +@@ -1,5 +1,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ ++datarootdir=@datarootdir@ + libdir=@libdir@ + includedir=@includedir@ + appdefaultdir=@appdefaultdir@ diff -r 97b3fdd21342 -r 94a28e1a8def xorg-x11-libXt/xorg-x11-libXt.spec --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xorg-x11-libXt/xorg-x11-libXt.spec Sun May 08 15:46:25 2011 +0200 @@ -0,0 +1,180 @@ +# +# spec file for package xorg-x11-libXt (Version 7.6_1.0.9) +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: xorg-x11-libXt +%define dirsuffix 1.0.9 +BuildRequires: fdupes pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel +Url: http://xorg.freedesktop.org/ +Version: 7.6_%{dirsuffix} +Release: 4.1 +Vendor: Europalab Software +Packager: Europalab Software +License: MIT License (or similar) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: System/Libraries +Provides: xorg-x11-libs:/usr/X11R6/%{_lib}/libXt.so.6 +Summary: X.Org Xt library +Source: libXt-%{dirsuffix}.tar.bz2 +Source2: baselibs.conf +Patch: libXt.diff +Patch1: app-defaults.diff + +%description +This package contains the X.Org Xt library. + + + +%package devel +Vendor: Europalab Software +Packager: Europalab Software +License: MIT License (or similar) +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries/X11 +Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/libXt.so +Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXt +AutoReqProv: on + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + + + +%prep +%setup -q -n libXt-%{dirsuffix} +%patch +%patch1 + +%build +autoreconf -fi +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +%configure --disable-silent-rules \ +%if %suse_version > 1110 +--disable-static \ +%endif +--with-pic +%{__make} %{?jobs:-j%jobs} + +%install +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/share/X11/app-defaults +%if %suse_version > 1110 +%{__rm} -f %{buildroot}%{_libdir}/*.la +%endif +%fdupes -s $RPM_BUILD_ROOT/%_mandir + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%pre devel +test -L usr/include/X11 && rm usr/include/X11 +exit 0 + +%files +%defattr(-,root,root) +%dir /usr/share/X11/app-defaults +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +/usr/include/X11/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* +%if %suse_version <= 1110 +%{_libdir}/*.a +%{_libdir}/*.la +%endif + +%changelog +* Tue Dec 21 2010 sndirsch@novell.com +- bumped version number to 7.6_1.0.9 +* Wed Dec 1 2010 jslaby@suse.de +- revert 'export only public API symbols' + it breaks xterm, xclock and others +* Tue Nov 30 2010 cristian.rodriguez@opensuse.org +- export only public API symbols +- disable silent rules, defeat the purpose of post build checks +* Fri Oct 29 2010 sndirsch@novell.com +- libXt 1.0.9 + * This release includes several bug fixes, as well as the usual + set of recent build configuration improvements & janitorial + cleanups. +* Sat Sep 4 2010 sndirsch@suse.de +- libXt 1.0.8 +- bumped version number to 7.5_1.0.8 +- make use of %%fdupes macro +- fixed Summary/Group entries in -devel package +* Sun Apr 4 2010 sndirsch@suse.de +- libXt 1.0.7 +- adjusted libXt.diff +- bumped version number to 7.5 +* Mon Dec 14 2009 jengelh@medozas.de +- add baselibs.conf as a source +* Sat Nov 14 2009 sndirsch@suse.de +- regenerated libXt.diff +- fixed build +* Sat Jul 4 2009 sndirsch@suse.de +- libXt 1.0.6 + * bugfix release +* Fri May 1 2009 eich@suse.de +- revert static library and .la file removal + for SUSE versions <= 11.1. +* Tue Apr 21 2009 crrodriguez@suse.de +- remove static libraries and "la" files +- run ldconfig in postun +* Thu Sep 11 2008 sndirsch@suse.de +- bumped release number to 7.4 +* Thu Apr 10 2008 ro@suse.de +- added baselibs.conf file to build xxbit packages + for multilib support +* Sat Sep 29 2007 sndirsch@suse.de +- bumped version to 7.3 +* Mon Jan 29 2007 sndirsch@suse.de +- update release to 1.0.5 + * Bug 9514: Markup error in makestrs.1x man page +* Wed Nov 8 2006 sndirsch@suse.de +- update release to 1.0.4 (X.Org 7.2 RC2) + * Add more generated files to ignore. + * Fix .pc file with new autotools by using AC_DEFINE_DIR. +* Sat Oct 14 2006 sndirsch@suse.de +- updated to X.Org 7.2RC1 +* Wed Aug 2 2006 sndirsch@suse.de +- completed search path for old app-defaults location +* Wed Aug 2 2006 sndirsch@suse.de +- fix setup line +* Mon Jul 31 2006 sndirsch@suse.de +- use /usr/share/X11 as default path for XtErrorDB, since this is + also the new default path for XErrorDB +* Fri Jul 28 2006 sndirsch@suse.de +- use "-fno-strict-aliasing" +* Thu Jul 27 2006 sndirsch@suse.de +- use $RPM_OPT_FLAGS +- remove existing /usr/include/X11 symlink in %%pre +* Tue Jul 25 2006 sndirsch@suse.de +- added app-defaults dir to package +* Tue Jul 25 2006 sndirsch@suse.de +- app-defaults.diff: read also /usr/X11R6/lib/X11/app-defaults +* Thu Jun 22 2006 sndirsch@suse.de +- created package