From 832ea9d4e5b408ab764efbaf65b9317521f0e05c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:38 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for libXxf86vm --- 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 03ab3d1f05f6292ebd7920d5192dd6db987d1f72 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 7 Oct 2009 18:02:48 +0000 Subject: [PATCH 2/4] - libXxf86vm 1.1.0 --- libXxf86vm.spec | 21 ++++++--------------- sources | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/libXxf86vm.spec b/libXxf86vm.spec index 08fb0fb..0c6931d 100644 --- a/libXxf86vm.spec +++ b/libXxf86vm.spec @@ -1,6 +1,6 @@ Summary: X.Org X11 libXxf86vm runtime library Name: libXxf86vm -Version: 1.0.99.1 +Version: 1.1.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -9,10 +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: xorg-x11-proto-devel -BuildRequires: libX11-devel -BuildRequires: libXext-devel +BuildRequires: pkgconfig(xext) pkgconfig(xf86vidmodeproto) %description X.Org X11 libXxf86vm runtime library @@ -28,14 +25,8 @@ X.Org X11 libXxf86vm development package %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-static make %install @@ -61,9 +52,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%if %{with_static} -%{_libdir}/libXxf86vm.a -%endif %{_libdir}/libXxf86vm.so %{_libdir}/pkgconfig/xxf86vm.pc #%dir %{_mandir}/man3x @@ -71,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/extensions/xf86vmode.h %changelog +* Wed Oct 07 2009 Adam Jackson 1.1.0-1 +- libXxf86vm 1.1.0 + * Fri Aug 28 2009 Peter Hutterer 1.0.99.1-1 - libXxf86vm 1.0.99.1 diff --git a/sources b/sources index 3f5be87..89627b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18579bdfd75aed88575930288bee4da7 libXxf86vm-1.0.99.1.tar.bz2 +b431ad7084e1055fef99a9115237edd8 libXxf86vm-1.1.0.tar.bz2 From d9ac03689ca676d5283a00a046920b140346b634 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:31 +0000 Subject: [PATCH 3/4] 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 1ed22b8..2b6c7d7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libXxf86vm 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 c6b3a3e14e9caeeadd60b5e4e75348dc9c96bed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:42:24 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 2b6c7d7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXxf86vm -# $Id$ -NAME := libXxf86vm -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 diff --git a/import.log b/import.log deleted file mode 100644 index e01b40f..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXxf86vm-1_0_2-1_fc10:HEAD:libXxf86vm-1.0.2-1.fc10.src.rpm:1220558680