From 7bbefe6080173d8efd8eb6bc293b6f25c605ce43 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Wed, 21 Apr 2010 06:02:09 +0000 Subject: [PATCH] New upstream, split data and main package --- .cvsignore | 2 +- sources | 2 +- usb_modeswitch-dir.patch | 22 +++++++++++----------- usb_modeswitch.spec | 39 ++++++++++++++------------------------- 4 files changed, 27 insertions(+), 38 deletions(-) diff --git a/.cvsignore b/.cvsignore index b379a6c..22e8494 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -usb-modeswitch-1.1.0.tar.bz2 +usb-modeswitch-1.1.2.tar.bz2 diff --git a/sources b/sources index d15adb1..6344225 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca19c6d2b8f933133b5ea344474abc7d usb-modeswitch-1.1.0.tar.bz2 +071cb300d00938bfe20025c654303d92 usb-modeswitch-1.1.2.tar.bz2 diff --git a/usb_modeswitch-dir.patch b/usb_modeswitch-dir.patch index bceeb95..a4805c7 100644 --- a/usb_modeswitch-dir.patch +++ b/usb_modeswitch-dir.patch @@ -1,12 +1,12 @@ -diff -Naur usb-modeswitch-1.1.0/usb_modeswitch.sh usb-modeswitch-1.1.0.dir/usb_modeswitch.sh ---- usb-modeswitch-1.1.0/usb_modeswitch.sh 2010-03-04 10:24:21.000000000 +0530 -+++ usb-modeswitch-1.1.0.dir/usb_modeswitch.sh 2010-03-04 10:25:00.000000000 +0530 -@@ -35,7 +35,7 @@ - global scsi usb match wc logging device +diff -Naur usb-modeswitch-1.1.2/Makefile usb-modeswitch-1.1.2.dir/Makefile +--- usb-modeswitch-1.1.2/Makefile 2010-04-17 23:57:11.000000000 +0530 ++++ usb-modeswitch-1.1.2.dir/Makefile 2010-04-20 10:28:04.345041264 +0530 +@@ -7,7 +7,7 @@ + PREFIX = $(DESTDIR)/usr + ETCDIR = $(DESTDIR)/etc + UDEVDIR = $(DESTDIR)/lib/udev +-SBINDIR = $(PREFIX)/sbin ++SBINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/share/man/man1 - set dbdir /etc/usb_modeswitch.d --set bindir /usr/sbin -+set bindir /usr/bin - - # argv contains the values provided from the udev rule - # separated by "/" + .PHONY: clean diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 8ff8f0b..632dffd 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,8 +1,8 @@ %define source_name usb-modeswitch Name: usb_modeswitch -Version: 1.1.0 -Release: 5%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: USB Modeswitch gets 4G cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -11,6 +11,7 @@ URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 Patch0: usb_modeswitch-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: usb_modeswitch-data BuildRequires: libusb-devel %description @@ -26,14 +27,6 @@ Dadurch erkennt Linux die Datenkarte und kann damit Internet- Verbindungen aufbauen. Die gängigen Karten von Huawei, T-Mobile, Vodafone, Option, ZTE und Novatell werden unterstützt. -%package data -Summary: USB Modeswitch device database -Requires: udev -Requires: tcl -Requires: %{name} = %{version}-%{release} - -%description data -Contains the device database and the rules file, including full paths %prep %setup -q -n %{source_name}-%{version} @@ -45,40 +38,36 @@ CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/ install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/ -gzip -9c usb_modeswitch.1 > usb_modeswitch.1.gz && install usb_modeswitch.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1 -install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT/lib/udev/usb_modeswitch -install -p -m 644 usb_modeswitch.d/* $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/ -install -p -m 644 40-usb_modeswitch.rules $RPM_BUILD_ROOT/lib/udev/rules.d +gzip -9c usb_modeswitch.1 > usb_modeswitch.1.gz && install -m 644 usb_modeswitch.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1 +install -p -m 755 usb_modeswitch.tcl $RPM_BUILD_ROOT/lib/udev/usb_modeswitch %clean rm -rf $RPM_BUILD_ROOT -%post data -udevadm control --reload-rules - -%postun data -udevadm control --reload-rules - %files %defattr(-,root,root,-) %{_bindir}/usb_modeswitch %{_mandir}/man1/usb_modeswitch.1.gz +/lib/udev/usb_modeswitch %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf %doc COPYING README ChangeLog -%files data -/lib/udev/rules.d/40-usb_modeswitch.rules -/lib/udev/usb_modeswitch -%{_sysconfdir}/usb_modeswitch.d/ %changelog +* Tue Apr 20 2010 Huzaifa Sidhpurwala - 1.1.2-1 +- New upstream +- Split data and main package + +* Mon Mar 8 2010 Huzaifa Sidhpurwala - 1.1.0-6 +- Version bump for F-12 build + * Sat Mar 6 2010 Huzaifa Sidhpurwala - 1.1.0-5 - Fix regression in rhbz #571001 - Version bump