From a8ed790c037acd3346b10b814ec9f6c9c10a6950 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 28 Sep 2008 19:25:04 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for xmmsctrl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From f86932b46b4b7f4eeadc7265924b9c89d9ae2e8f Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 28 Sep 2008 19:48:07 +0000 Subject: [PATCH 2/4] - Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN Sat Sep 27 2008 Orcan Ogetbil - 1.8-3 - Added DistTag - Removed ExclusiveArch - Changed 0444 file permissions to 0644 - Changed %%defattr to (-,root,root,-) - Honored Fedora specific compilation flags - Support parallel make Mon Sep 22 2008 Orcan Ogetbil - 1.8-2 - Repack for Fedora - Don't strip the binary patch Mon Feb 18 2002 Jan IVEN - 1.8-1 - Initial build. --- .cvsignore | 1 + import.log | 1 + sources | 1 + xmmsctrl-no-strip.patch | 11 ++++++++ xmmsctrl.spec | 61 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 import.log create mode 100644 xmmsctrl-no-strip.patch create mode 100644 xmmsctrl.spec diff --git a/.cvsignore b/.cvsignore index e69de29..e505e30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xmmsctrl-1.8.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..a38b7ed --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xmmsctrl-1_8-4_fc9:F-9:xmmsctrl-1.8-4.fc9.src.rpm:1222631279 diff --git a/sources b/sources index e69de29..346b76c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0774f3e61cfc89c1fd3f0526c48b35db xmmsctrl-1.8.tar.gz diff --git a/xmmsctrl-no-strip.patch b/xmmsctrl-no-strip.patch new file mode 100644 index 0000000..046f422 --- /dev/null +++ b/xmmsctrl-no-strip.patch @@ -0,0 +1,11 @@ +diff -rupN old/xmmsctrl-1.8/Makefile new/xmmsctrl-1.8/Makefile +--- old/xmmsctrl-1.8/Makefile 2004-04-02 08:00:12.000000000 -0500 ++++ new/xmmsctrl-1.8/Makefile 2008-09-23 00:48:36.000000000 -0400 +@@ -16,7 +16,6 @@ all : $(TARGET) HELP + + $(TARGET) : xmmsctrl.c removefile.c + $(CC) -o $(TARGET) xmmsctrl.c removefile.c $(CFLAGS) $(LDFLAGS) +- strip xmmsctrl + + HELP : xmmsctrl + ./xmmsctrl > HELP || true diff --git a/xmmsctrl.spec b/xmmsctrl.spec new file mode 100644 index 0000000..f370c21 --- /dev/null +++ b/xmmsctrl.spec @@ -0,0 +1,61 @@ +Summary: Command line control utility for xmms +Name: xmmsctrl +Version: 1.8 +Release: 4%{?dist} +URL: http://www.docs.uu.se/~adavid +Source0: http://user.it.uu.se/~adavid/utils/%{name}-%{version}.tar.gz +Patch0: xmmsctrl-no-strip.patch +License: GPLv2 +Group: Applications/Multimedia +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: xmms +BuildRequires: xmms-devel + +%description +xmmsctrl is a small utility to control xmms from the command line. Its +goal is to be used coupled with sh to test xmms state and perform an +appropriate action, e.g. if playing then pause else play. The interest +of this is to bind keys in a window manager to have control over xmms +with keys that do play/next/pause, prev, control sound... + +%prep +%setup -q +%patch0 -p2 -b .nostrip +chmod 0644 samples/* + +%build +make %{?_smp_mflags} WARN="${RPM_OPT_FLAGS}" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT}/%{_bindir} +install -m 755 %{name} ${RPM_BUILD_ROOT}/%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc Changelog README HELP samples +%{_bindir}/xmmsctrl + +%changelog +* Sat Sep 28 2008 Orcan Ogetbil - 1.8-4 +- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN + +* Sat Sep 27 2008 Orcan Ogetbil - 1.8-3 +- Added DistTag +- Removed ExclusiveArch +- Changed 0444 file permissions to 0644 +- Changed %%defattr to (-,root,root,-) +- Honored Fedora specific compilation flags +- Support parallel make + +* Mon Sep 22 2008 Orcan Ogetbil - 1.8-2 +- Repack for Fedora +- Don't strip the binary patch + +* Mon Feb 18 2002 Jan IVEN - 1.8-1 +- Initial build. + + From 3cf92756660d63414e5ca986bc2a11085c72471e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:57 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index af5e5a6..95d993a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmmsctrl -# $Id$ +# $Id: Makefile,v 1.1 2008/09/28 19:25:02 kevin Exp $ NAME := xmmsctrl 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 3c627b6f34b2ea44a05c7158df10f4e4b79960a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:01:52 +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 95d993a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmmsctrl -# $Id: Makefile,v 1.1 2008/09/28 19:25:02 kevin Exp $ -NAME := xmmsctrl -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),) -# 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) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index a38b7ed..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xmmsctrl-1_8-4_fc9:F-9:xmmsctrl-1.8-4.fc9.src.rpm:1222631279