dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

import.log

@@ -1 +0,0 @@
-libXxf86vm-1_0_2-1_fc10:HEAD:libXxf86vm-1.0.2-1.fc10.src.rpm:1220558680

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 <ajax@redhat.com> 1.1.0-1
+- libXxf86vm 1.1.0
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.0.99.1-1
 - libXxf86vm 1.0.99.1
 

sources

@@ -1 +1 @@
-18579bdfd75aed88575930288bee4da7  libXxf86vm-1.0.99.1.tar.bz2
+b431ad7084e1055fef99a9115237edd8  libXxf86vm-1.1.0.tar.bz2