From 97ee9a436c007a6239029b80101b1f599cc76d40 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:18:37 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for libdmx --- 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 c066e7cf7c0f396dff3b94e2329992f60d3f1f2b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 7 Oct 2009 17:57:04 +0000 Subject: [PATCH 2/4] - libdmx 1.1.0 --- libdmx.spec | 11 +++++------ sources | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libdmx.spec b/libdmx.spec index f6fe935..89e60c3 100644 --- a/libdmx.spec +++ b/libdmx.spec @@ -1,6 +1,6 @@ Summary: X.Org X11 DMX runtime library Name: libdmx -Version: 1.0.99.1 +Version: 1.1.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -BuildRequires: pkgconfig -BuildRequires: libXext-devel +BuildRequires: pkgconfig(xext) %description The X.Org X11 DMX (Distributed Multihead X) runtime library. @@ -19,8 +18,6 @@ The X.Org X11 DMX (Distributed Multihead X) runtime library. Summary: X.Org X11 DMX development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: xorg-x11-proto-devel -Requires: pkgconfig %description devel The X.Org X11 DMX (Distributed Multihead X) development files. @@ -28,7 +25,6 @@ The X.Org X11 DMX (Distributed Multihead X) development files. %prep %setup -q -# Disable static library creation by default. %build %configure --disable-static make %{?_smp_mflags} @@ -61,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/extensions/dmxext.h %changelog +* Wed Oct 07 2009 Adam Jackson 1.1.0-1 +- libdmx 1.1.0 + * Fri Aug 28 2009 Peter Hutterer 1.0.99.1-1 - libdmx 1.0.99.1 diff --git a/sources b/sources index 545daa0..0cb05ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd8d5777a4ac53e06573c4bde178621e libdmx-1.0.99.1.tar.bz2 +a2fcf0382837888d3781b714489a8999 libdmx-1.1.0.tar.bz2 From c8cd831aa161bbbabf670eb6b9e34b75dc78c1bc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:46:39 +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 5a3e319..2525108 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libdmx -# $Id: Makefile,v 1.1 2005/08/26 21:43:56 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:00:01 notting Exp $ NAME := libdmx 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 ad66c7cf9d7cfe75f368ef127eeb86f8b8c68c9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:43:08 +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 2525108..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libdmx -# $Id: Makefile,v 1.2 2007/10/15 19:00:01 notting Exp $ -NAME := libdmx -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