From 2fee890aa1f3b228606ed6bd690b92aed6972cf9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:21 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for libXfixes --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 0b7431adfd3216d2701778e77340bbfc49a2d114 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 13 Oct 2009 15:45:45 +0000 Subject: [PATCH 2/4] - libXfixes 4.0.4 --- libXfixes.spec | 46 +++++++++++++++++++--------------------------- sources | 2 +- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/libXfixes.spec b/libXfixes.spec index 8684374..daed23d 100644 --- a/libXfixes.spec +++ b/libXfixes.spec @@ -1,7 +1,7 @@ -Summary: X.Org X11 libXfixes runtime library +Summary: X Fixes library Name: libXfixes -Version: 4.0.3 -Release: 8%{?dist} +Version: 4.0.4 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -9,40 +9,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -BuildRequires: pkgconfig -BuildRequires: libX11-devel -BuildRequires: xorg-x11-proto-devel >= 7.0-7 - -Obsoletes: XFree86-libs, xorg-x11-libs +BuildRequires: pkgconfig(fixesproto) pkgconfig(xext) %description -X.Org X11 libXfixes runtime library +X Fixes library. %package devel -Summary: X.Org X11 libXfixes development package +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} - -# xfixes.pc Requires: xproto fixesproto >= 4.0 -Requires: xorg-x11-proto-devel >= 7.0-7 - -Obsoletes: XFree86-devel, xorg-x11-devel +Requires: pkgconfig %description devel -X.Org X11 libXfixes development package +libXfixes development package %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif -make +%configure --disable-static +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -67,14 +53,20 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_includedir}/X11/extensions/Xfixes.h -%if %{with_static} -%{_libdir}/libXfixes.a -%endif %{_libdir}/libXfixes.so %{_libdir}/pkgconfig/xfixes.pc %{_mandir}/man3/Xfixes.3* %changelog +* Tue Oct 13 2009 Adam Jackson 4.0.4-1 +- libXfixes 4.0.4 + +* Thu Oct 08 2009 Parag - 4.0.3-9 +- Merge-Review #226071 +- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes +- Removed BR:pkgconfig +- spec cleanups + * Fri Jul 24 2009 Fedora Release Engineering - 4.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a672735..a983d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1990d19725a3c7f32290037f02d3737f libXfixes-4.0.3.tar.bz2 +7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2 From 0d5c93a3b30967795a5d85ba558caa0915e5f2d5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:52 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1cd3cbe..64e8619 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXfixes -# $Id: Makefile,v 1.1 2005/08/26 21:24:31 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:07 notting Exp $ NAME := libXfixes 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 b3fe52e5f5bafd340cffab88ec5ad207f4c100a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:38:07 +0000 Subject: [PATCH 4/4] 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 64e8619..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXfixes -# $Id: Makefile,v 1.2 2007/10/15 18:58:07 notting Exp $ -NAME := libXfixes -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12