From f0c816f72dce1f138b4cf34eb2fa0ade606537a8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 14:58:42 +0000 Subject: [PATCH 1/9] Initialize branch F-8 for wmix --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 355a329d6da9123c6a45d2e13a1824995d3dc5ef Mon Sep 17 00:00:00 2001 From: pertusus Date: Fri, 28 Dec 2007 16:43:11 +0000 Subject: [PATCH 2/9] - keep timestamps --- wmix.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wmix.spec b/wmix.spec index c78d394..9af26af 100644 --- a/wmix.spec +++ b/wmix.spec @@ -1,10 +1,10 @@ Name: wmix Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dockapp mixer Group: User Interface/X -License: GPL +License: GPLv2+ URL: http://www.ne.jp/asahi/linux/timecop/#wmix Source0: http://www.ne.jp/asahi/linux/timecop/software/wmix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +27,7 @@ configuration file to control some of the features. %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS= +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" %install @@ -36,7 +36,7 @@ install -d -m755 $RPM_BUILD_ROOT%{_bindir} make install PREFIX=$RPM_BUILD_ROOT%{_prefix} gunzip wmix.1x.gz install -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -m644 wmix.1x $RPM_BUILD_ROOT%{_mandir}/man1/wmix.1 +install -p -m644 wmix.1x $RPM_BUILD_ROOT%{_mandir}/man1/wmix.1 %clean @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 28 2007 Patrice Dumas 3.1-2 +- keep timestamps + * Wed Aug 9 2006 Patrice Dumas 3.1-1 - Initial Release From 074501a70a587d9b3e5d42155e9934dbe15595ba Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 18:32:34 +0000 Subject: [PATCH 3/9] - Autorebuild for GCC 4.3 --- wmix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmix.spec b/wmix.spec index 9af26af..625c4a0 100644 --- a/wmix.spec +++ b/wmix.spec @@ -1,6 +1,6 @@ Name: wmix Version: 3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dockapp mixer Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 3.1-3 +- Autorebuild for GCC 4.3 + * Fri Dec 28 2007 Patrice Dumas 3.1-2 - keep timestamps From 4cada21f4da5c06947b4ff5fe7cd93bbca0cbf87 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:55:59 +0000 Subject: [PATCH 4/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wmix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmix.spec b/wmix.spec index 625c4a0..5729bb9 100644 --- a/wmix.spec +++ b/wmix.spec @@ -1,6 +1,6 @@ Name: wmix Version: 3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Dockapp mixer Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 3.1-3 - Autorebuild for GCC 4.3 From 3415e5d5728abd49a4942578ee3de0d78dbce2c8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:21:01 +0000 Subject: [PATCH 5/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wmix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmix.spec b/wmix.spec index 5729bb9..920be92 100644 --- a/wmix.spec +++ b/wmix.spec @@ -1,6 +1,6 @@ Name: wmix Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Dockapp mixer Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 287a45a9d460ed6e75cc7390b4106bc2f3c062e6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 30 Jul 2009 01:55:18 +0000 Subject: [PATCH 6/9] kill with fire --- Makefile | 21 ---------------- dead.package | 1 + sources | 1 - wmix.spec | 68 ---------------------------------------------------- 4 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wmix.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 165aad2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wmix -# $Id$ -NAME := wmix -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) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e195e21 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphan clean up diff --git a/sources b/sources deleted file mode 100644 index d36159a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -62f6e86f7558f193e081dc29444a6699 wmix-3.1.tar.gz diff --git a/wmix.spec b/wmix.spec deleted file mode 100644 index 920be92..0000000 --- a/wmix.spec +++ /dev/null @@ -1,68 +0,0 @@ -Name: wmix -Version: 3.1 -Release: 5%{?dist} -Summary: Dockapp mixer - -Group: User Interface/X -License: GPLv2+ -URL: http://www.ne.jp/asahi/linux/timecop/#wmix -Source0: http://www.ne.jp/asahi/linux/timecop/software/wmix-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libX11-devel -BuildRequires: libXext-devel -BuildRequireS: libXpm-devel - -%description -Dockapp mixer for OSS or ALSA. Allows toggling record source, muting -individual channels, adjusting volume and balance, all in a compact -dockapp size, with TV-like on-screen-display for volume levels. Supports -mousewheel to adjust current channel volume, and can be controlled -remotely with SIGUSR1 / SIGUSR2 to adjust the volume, too. Can use a -configuration file to control some of the features. - - -%prep -%setup -q - - -%build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" - - -%install -rm -rf $RPM_BUILD_ROOT -install -d -m755 $RPM_BUILD_ROOT%{_bindir} -make install PREFIX=$RPM_BUILD_ROOT%{_prefix} -gunzip wmix.1x.gz -install -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -p -m644 wmix.1x $RPM_BUILD_ROOT%{_mandir}/man1/wmix.1 - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc NEWS README AUTHORS BUGS sample.wmixrc COPYING -%{_bindir}/wmix -%{_mandir}/man1/wmix.1* - - -%changelog -* Mon Jul 27 2009 Fedora Release Engineering - 3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Fedora Release Engineering - 3.1-3 -- Autorebuild for GCC 4.3 - -* Fri Dec 28 2007 Patrice Dumas 3.1-2 -- keep timestamps - -* Wed Aug 9 2006 Patrice Dumas 3.1-1 -- Initial Release - From 9fb7f65bb84c27db77e058a7f0466ce92df63f27 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:53 +0000 Subject: [PATCH 7/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 165aad2..25c0b6a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wmix 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 6d891e136ae69e3edf02b62ec9eb96debc3673ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:02 +0000 Subject: [PATCH 8/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 25c0b6a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wmix -# $Id$ -NAME := wmix -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From ab5740ecba024d76d3d7f5727757e09c87b982fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:04 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore