dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:38:55 +00:00 · 2009-11-26 01:13:34 +00:00 · 2009-02-20 12:56:45 +00:00 · 2009-02-16 19:47:42 +00:00 · 2009-02-10 22:45:09 +00:00
3 changed files with 22 additions and 28 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: udev-extras
-# $Id$
-NAME := udev-extras
-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),)
-# attept 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)
--- a/udev-extras.spec
+++ b/udev-extras.spec
@ -1,9 +1,10 @@
-%define udev_scriptdir /lib/udev
+%define udev_bindir /lib/udev
+%define udev_scriptdir /etc/udev

 Summary: Extra rules and tools for udev
 Name: udev-extras
 Version: 20090125
-Release: 0.1.20090129git%{?dist}
+Release: 0.3.20090129git%{?dist}
 # Source from http://git.kernel.org/?p=linux/hotplug/udev-extras.git
 Source: udev-extras-20090125-git20090129.tar.bz2
 License: GPLv2 and GPLv2+
@ -12,7 +13,7 @@ Group: System Environment/Base
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: udev >= 135
+Requires: udev >= 124
 BuildRequires: glib2-devel
 BuildRequires: libusb-devel
 BuildRequires: libxslt
@ -33,6 +34,16 @@ rm -rf $RPM_BUILD_ROOT

 make install DESTDIR=$RPM_BUILD_ROOT

+# Don't install modem prober for now; that's handled by NM at this time and
+# in the future will be handled by ModemManager instead
+rm -f $RPM_BUILD_ROOT%{udev_bindir}/modem-probe
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/modem-probe*.8*
+# F-9 uses /etc/udev/rules.d, not /lib/udev/rules.d
+rm -f $RPM_BUILD_ROOT%{udev_bindir}/rules.d/77-probe-modem-capabilities.rules
+
+mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/
+mv $RPM_BUILD_ROOT%{udev_bindir}/rules.d/*.rules $RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/
+
 %clean
 rm -rf $RPM_BUILD_ROOT

@ -40,14 +51,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644, root, root, 0755)
 %doc COPYING TODO 
 #%doc README ChangeLog
-%attr(0755,root,root) %{udev_scriptdir}/modem-modeswitch
-%attr(0755,root,root) %{udev_scriptdir}/modem-probe
-%attr(0755,root,root) %{udev_scriptdir}/usbdev_id
+%attr(0755,root,root) %{udev_bindir}/modem-modeswitch
+%attr(0755,root,root) %{udev_bindir}/usbdev_id
 %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 %attr(0644,root,root) %{_mandir}/man8/modem-modeswitch*.8*
-%attr(0644,root,root) %{_mandir}/man8/modem-probe*.8*

 %changelog
+* Fri Feb 20 2009 Dan Williams <dcbw@redhat.com> 20090125-0.3.20090129git
+- Remove modem prober; handled elsewhere for now
+
+* Mon Feb 16 2009 Dan Williams <dcbw@redhat.com> 20090125-0.2.20090129git
+- Match udev requirement to distro's shipped udev
+
 * Thu Jan 29 2009 Dan Williams <dcbw@redhat.com> 20090125-0.1.20090129git
 - Compatibilty updates and fixes for modem prober
Author	SHA1	Message	Date
Fedora Release Engineering	f27f4d5e48	dist-git conversion	2010-07-29 14:38:55 +00:00
Bill Nottingham	414f84cb00	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:13:34 +00:00
Daniel Williams	fde3c4adbd	- Remove modem prober; handled elsewhere for now	2009-02-20 12:56:45 +00:00
Daniel Williams	4ddf5a4317	- Match udev requirement to distro's shipped udev	2009-02-16 19:47:42 +00:00
Kevin Fenzi	58260adc0c	Initialize branch F-9 for udev-extras	2009-02-10 22:45:09 +00:00