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 5a3e319..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libdmx -# $Id: Makefile,v 1.1 2005/08/26 21:43:56 mharris 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 -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/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