From 0fbb10d6322d4a751af34ac99d15ea161230f4d6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:58:04 +0000 Subject: [PATCH 1/7] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd4572f..dc2e27d 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := libXext SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 068828b1a4c610967711f17301f6c415d78985c9 Mon Sep 17 00:00:00 2001 From: pnemade Date: Tue, 15 Jan 2008 06:51:55 +0000 Subject: [PATCH 2/7] - Merge-Review #226070 - Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes - Removed BR:pkgconfig - Removed zero-length README file --- libXext.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libXext.spec b/libXext.spec index 44415fb..c4cbd73 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,21 +1,18 @@ Summary: X.Org X11 libXext runtime library Name: libXext Version: 1.0.1 -Release: 4%{?dist} -License: MIT/X11 +Release: 5%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel >= 7.1-10 BuildRequires: libX11-devel BuildRequires: libXau-devel -Obsoletes: XFree86-libs, xorg-x11-libs - %description X.Org X11 libXext runtime library @@ -25,11 +22,10 @@ Group: Development/Libraries Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} -Requires: libX11-devel +Requires: libX11-devel pkgconfig # xorg-x11-proto-devel is needed by xext.pc Requires: xorg-x11-proto-devel >= 7.0-1 -Obsoletes: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXext development package @@ -46,7 +42,7 @@ X.Org X11 libXext development package %if ! %{with_static} --disable-static %endif -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -64,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING ChangeLog %{_libdir}/libXext.so.6 %{_libdir}/libXext.so.6.4.0 @@ -79,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3x* %changelog +* Tue Jan 15 2008 parag - 1.0.1-5 +- Merge-Review #226070 +- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes +- Removed BR:pkgconfig +- Removed zero-length README file + * Tue Aug 21 2007 Adam Jackson - 1.0.1-4 - Rebuild for build id From b0cee28dc40062007ed5cb93f480562a48ae06a9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 02:16:22 +0000 Subject: [PATCH 3/7] - Autorebuild for GCC 4.3 --- libXext.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXext.spec b/libXext.spec index c4cbd73..bb61057 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXext runtime library Name: libXext Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3x* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-6 +- Autorebuild for GCC 4.3 + * Tue Jan 15 2008 parag - 1.0.1-5 - Merge-Review #226070 - Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes From eec1205df3145e86833e39e526f42bdd3546c1cf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 29 Feb 2008 22:29:02 +0000 Subject: [PATCH 4/7] libXext 1.0.4 --- .cvsignore | 2 +- libXext.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index bab09c8..9c1ef18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXext-1.0.1.tar.bz2 +libXext-1.0.4.tar.bz2 diff --git a/libXext.spec b/libXext.spec index bb61057..35717b5 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXext runtime library Name: libXext -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.4 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -72,9 +72,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXext.so %{_libdir}/pkgconfig/xext.pc #%dir %{_mandir}/man3x -%{_mandir}/man3/*.3x* +%{_mandir}/man3/*.3* %changelog +* Fri Feb 29 2008 Adam Jackson 1.0.4-1 +- libXext 1.0.4 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-6 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 3d9ca86..0758f70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7f3f752d291865108689c889d160ea0 libXext-1.0.1.tar.bz2 +a91f1f722ac80c597cf0b75dcb8b48c0 libXext-1.0.4.tar.bz2 From 470f5ecea009301ae274927c5fdef7f42e12c4be Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:20:56 +0000 Subject: [PATCH 5/7] Initialize branch F-10 for libXext --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From a0cfe581ccc1a1e390394a62623ce273610cb4f9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:44 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc2e27d..bc53ace 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libXext SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c5cd4d1f77d6405246e53ccf8627b089e20eae5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:37:56 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bc53ace..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXext -# $Id$ -NAME := libXext -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10