From 1a58326aec147145ec6c5998a3f5a336978cdddb Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Nov 23 2010 15:55:09 +0000 Subject: today's snapshot, udev rules update --- diff --git a/.gitignore b/.gitignore index 64f7d25..a2cb642 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wayland-20101111.tar.bz2 +/wayland-20101123.tar.bz2 diff --git a/sources b/sources index 0103cc0..8a7746d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a8a09e6a5607b4aedda51d7699688f1 wayland-20101111.tar.bz2 +de9e1322aaa4efa596e167527b8f8ea3 wayland-20101123.tar.bz2 diff --git a/wayland-install-compositor.patch b/wayland-install-compositor.patch index f7d57b7..60bc8f2 100644 --- a/wayland-install-compositor.patch +++ b/wayland-install-compositor.patch @@ -1,9 +1,18 @@ -diff -up wayland-20101111/compositor/Makefile.am.jx wayland-20101111/compositor/Makefile.am ---- wayland-20101111/compositor/Makefile.am.jx 2010-11-10 08:42:17.000000000 -0500 -+++ wayland-20101111/compositor/Makefile.am 2010-11-11 17:18:07.000000000 -0500 +diff -up wayland-20101123/compositor/Makefile.am.jx wayland-20101123/compositor/Makefile.am +--- wayland-20101123/compositor/Makefile.am.jx 2010-11-22 21:54:15.000000000 -0500 ++++ wayland-20101123/compositor/Makefile.am 2010-11-23 10:46:02.000000000 -0500 @@ -1,4 +1,4 @@ -noinst_PROGRAMS = compositor +bin_PROGRAMS = compositor INCLUDES = \ -I$(top_srcdir)/wayland \ +@@ -22,7 +22,7 @@ compositor_SOURCES = \ + drm.c \ + shm.c + +-udevdir = $(sysconfdir)/udev ++udevdir = $(sysconfdir)/udev/rules.d + + dist_udev_DATA = \ + 70-wayland.rules diff --git a/wayland.spec b/wayland.spec index 2dba655..e6e3040 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,14 +1,15 @@ -%global gitdate 20101111 +%global gitdate 20101123 Name: wayland Version: 0.1 -Release: 0.1%{?gitdate:.%{gitdate}}%{?dist} +Release: 0.2%{?gitdate:.%{gitdate}}%{?dist} Summary: Wayland compositor Group: User Interface/X License: GPLv2+ URL: http://%{name}.freedesktop.org/ Source0: wayland-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh Patch0: wayland-no-clients.patch Patch1: wayland-install-compositor.patch @@ -100,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README %{_bindir}/compositor -%{_sysconfdir}/udev/*.rules +%{_sysconfdir}/udev/rules.d/*.rules %files common %defattr(-,root,root,-) @@ -130,5 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libwayland-server.so %changelog +* Tue Nov 23 2010 Adam Jackson 0.1-0.2} +- Today's git snap +- Fix udev rule install (#653353) + * Mon Nov 15 2010 Adam Jackson 0.1-0.1.20101111 - Initial packaging