From f23e8810fe2109aa109f8964f914a1730b281534 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 Apr 2009 16:44:24 +0000 Subject: [PATCH 01/13] Initialize branch F-11 for abby --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 1c69a0059e46f328ac5f8b0826152675698fcc27 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Thu, 23 Apr 2009 21:02:16 +0000 Subject: [PATCH 02/13] New package --- .cvsignore | 1 + abby.spec | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 66 insertions(+) create mode 100644 abby.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..892a021 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +abby-0.2.0.tar.bz2 diff --git a/abby.spec b/abby.spec new file mode 100644 index 0000000..4011a0f --- /dev/null +++ b/abby.spec @@ -0,0 +1,63 @@ +Name: abby +Version: 0.2.0 +Release: 2%{?dist} +Summary: Front-end for cclive and clive + +Group: Applications/Multimedia +License: GPLv3+ +URL: http://code.google.com/p/abby/ +Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: qt-devel desktop-file-utils +Requires: cclive + +%description +abby is a front-end for clive and cclive, allowing users unfamiliar with +command-line interfaces to make most of cclive using a graphical +user-interface. abby is written in C++. + +%prep +%setup -q +echo "[Desktop Entry]" > %{name}.desktop +echo "Name=abby" >> %{name}.desktop +echo "GenericName=abby" >> %{name}.desktop +echo "Comment=Front-end for cclive and clive" >> %{name}.desktop +echo "Exec=abby" >> %{name}.desktop +echo "Terminal=false" >> %{name}.desktop +echo "Type=Application" >> %{name}.desktop +echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop + + + +%build +qmake-qt4 +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_bindir} +install -Dm 755 -p %{name} $RPM_BUILD_ROOT%{_bindir} +desktop-file-install --vendor="" \ + --dir=%{buildroot}%{_datadir}/applications/ \ + %{name}.desktop + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES COPYING README TODO +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop + + +%changelog +* Tue Apr 21 2009 Nicoleau Fabien 0.2.0-2 +- URL fix +- Add cclive as an explicit require +* Sun Apr 5 2009 Nicoleau Fabien 0.2.0-1 +- Initial build diff --git a/import.log b/import.log new file mode 100644 index 0000000..f2b81b5 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +abby-0_2_0-2_fc10:F-11:abby-0.2.0-2.fc10.src.rpm:1240520513 diff --git a/sources b/sources index e69de29..77e5d8f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +79f5ee92dc51412361ac6c0b72eced64 abby-0.2.0.tar.bz2 From 749f2498cfc23f198b91a37b0ef872d95107d8ea Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Fri, 8 May 2009 20:56:25 +0000 Subject: [PATCH 03/13] Update to 0.2.1 --- .cvsignore | 2 +- abby.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 892a021..1ff9d9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.2.0.tar.bz2 +abby-0.2.1.tar.bz2 diff --git a/abby.spec b/abby.spec index 4011a0f..0db8840 100644 --- a/abby.spec +++ b/abby.spec @@ -1,6 +1,6 @@ Name: abby -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Front-end for cclive and clive Group: Applications/Multimedia @@ -56,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 6 2009 Nicoleau Fabien 0.2.1-1 +- Rebuild for 0.2.1 * Tue Apr 21 2009 Nicoleau Fabien 0.2.0-2 - URL fix - Add cclive as an explicit require diff --git a/sources b/sources index 77e5d8f..82df7e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79f5ee92dc51412361ac6c0b72eced64 abby-0.2.0.tar.bz2 +7244a8aea22af87bfcd741ee6212a9e9 abby-0.2.1.tar.bz2 From d189eb58e728350e190c49dd96c7e22fa98176fa Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 11 Jul 2009 23:23:08 +0000 Subject: [PATCH 04/13] Update to 0.4.1 --- .cvsignore | 2 +- abby.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ff9d9c..2b2ebdd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.2.1.tar.bz2 +abby-0.4.1.tar.bz2 diff --git a/abby.spec b/abby.spec index 0db8840..b4d73d5 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.2.1 +Version: 0.4.1 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -31,7 +31,7 @@ echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop %build -qmake-qt4 +qmake-qt4 "QT+=network xml" make %{?_smp_mflags} @@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 11 2009 Nicoleau Fabien 0.4.1-1 +- Rebuild for 0.4.1 +* Mon Jun 22 2009 Nicoleau Fabien 0.3.0-1 +- Rebuild for 0.3.0 * Wed May 6 2009 Nicoleau Fabien 0.2.1-1 - Rebuild for 0.2.1 * Tue Apr 21 2009 Nicoleau Fabien 0.2.0-2 diff --git a/sources b/sources index 82df7e9..e9a38a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7244a8aea22af87bfcd741ee6212a9e9 abby-0.2.1.tar.bz2 +d76eeeac6e674487bec30632c82590d2 abby-0.4.1.tar.bz2 From 4574cc5c9e24e678c92d6cdbbf32d66f1db276b7 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Mon, 3 Aug 2009 13:39:55 +0000 Subject: [PATCH 05/13] Update to 0.4.2 --- .cvsignore | 2 +- abby.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2b2ebdd..be5992f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.1.tar.bz2 +abby-0.4.2.tar.bz2 diff --git a/abby.spec b/abby.spec index b4d73d5..b476df0 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -29,9 +29,8 @@ echo "Type=Application" >> %{name}.desktop echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop - %build -qmake-qt4 "QT+=network xml" +qmake-qt4 make %{?_smp_mflags} @@ -56,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 3 2009 Nicoleau Fabien 0.4.2-1 +- Update to 0.4.2 +* Fri Jul 24 2009 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Sat Jul 11 2009 Nicoleau Fabien 0.4.1-1 - Rebuild for 0.4.1 * Mon Jun 22 2009 Nicoleau Fabien 0.3.0-1 diff --git a/sources b/sources index e9a38a2..50fb84f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d76eeeac6e674487bec30632c82590d2 abby-0.4.1.tar.bz2 +5ee4b1d085461a7fda7bba46c4fa677b abby-0.4.2.tar.bz2 From be5567446819231ae3a51ced2d68b72c4efa7c21 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 5 Sep 2009 14:51:08 +0000 Subject: [PATCH 06/13] Update to 0.4.3 --- .cvsignore | 2 +- abby.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index be5992f..3cdee66 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.2.tar.bz2 +abby-0.4.3.tar.bz2 diff --git a/abby.spec b/abby.spec index b476df0..0084385 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 5 2009 Nicoleau Fabien 0.4.3-1 +- Update to 0.4.3 * Mon Aug 3 2009 Nicoleau Fabien 0.4.2-1 - Update to 0.4.2 * Fri Jul 24 2009 Fedora Release Engineering - 0.4.1-2 diff --git a/sources b/sources index 50fb84f..f0266ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ee4b1d085461a7fda7bba46c4fa677b abby-0.4.2.tar.bz2 +943a2d2c33ba8d7c437b814f0da71f67 abby-0.4.3.tar.bz2 From 81c92171bcffdcf22f2832831b2b167f402316b1 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 31 Oct 2009 18:09:25 +0000 Subject: [PATCH 07/13] Update to 0.4.4 --- .cvsignore | 2 +- abby.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3cdee66..1ff168f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.3.tar.bz2 +abby-0.4.4.tar.bz2 diff --git a/abby.spec b/abby.spec index 0084385..06605ec 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.3 +Version: 0.4.4 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 31 2009 Nicoleau Fabien 0.4.4-1 +- Update to 0.4.4 * Sun Sep 5 2009 Nicoleau Fabien 0.4.3-1 - Update to 0.4.3 * Mon Aug 3 2009 Nicoleau Fabien 0.4.2-1 diff --git a/sources b/sources index f0266ad..d62860f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -943a2d2c33ba8d7c437b814f0da71f67 abby-0.4.3.tar.bz2 +15bdf608a2f30c050df3057365716963 abby-0.4.4.tar.bz2 From 15af4d40956eb562113039c40582f804745550b2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:07 +0000 Subject: [PATCH 08/13] 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 12eadf0..d13ee1e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abby 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 256e26dcc417798e491bb216fdddad4e5e90fb29 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 28 Nov 2009 19:29:12 +0000 Subject: [PATCH 09/13] Update to 0.4.5 --- .cvsignore | 2 +- abby.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ff168f..2cb54b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.4.tar.bz2 +abby-0.4.5.tar.bz2 diff --git a/abby.spec b/abby.spec index 06605ec..01ff448 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.4 +Version: 0.4.5 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 28 2009 Nicoleau Fabien 0.4.5-1 +- Update to 0.4.5 +* Tue Nov 24 2009 Kevin Kofler 0.4.4-2 +- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) * Sat Oct 31 2009 Nicoleau Fabien 0.4.4-1 - Update to 0.4.4 * Sun Sep 5 2009 Nicoleau Fabien 0.4.3-1 diff --git a/sources b/sources index d62860f..27115ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15bdf608a2f30c050df3057365716963 abby-0.4.4.tar.bz2 +7ac13b41a5964f9f726d22d66d5d4195 abby-0.4.5.tar.bz2 From 662110a875b3702da8d3ee0a65088283dd235b46 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sun, 6 Dec 2009 17:03:06 +0000 Subject: [PATCH 10/13] Update to 0.4.6.1 --- .cvsignore | 2 +- abby.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2cb54b6..e7a17d6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.5.tar.bz2 +abby-0.4.6.1.tar.bz2 diff --git a/abby.spec b/abby.spec index 01ff448..dc53193 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.5 +Version: 0.4.6.1 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 6 2009 Nicoleau Fabien 0.4.6.1-1 +- Update to 0.4.6.1 * Sat Nov 28 2009 Nicoleau Fabien 0.4.5-1 - Update to 0.4.5 * Tue Nov 24 2009 Kevin Kofler 0.4.4-2 diff --git a/sources b/sources index 27115ad..2c296cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ac13b41a5964f9f726d22d66d5d4195 abby-0.4.5.tar.bz2 +f8ca71a7c4a07b4aa1c51bc1b66d24d7 abby-0.4.6.1.tar.bz2 From 2b08dddbc1452262dc3ccbe1e946e25f7b8bc8fe Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Fri, 18 Dec 2009 23:18:01 +0000 Subject: [PATCH 11/13] Update to 0.4.7 --- .cvsignore | 2 +- abby.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e7a17d6..be45910 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.6.1.tar.bz2 +abby-0.4.7.tar.bz2 diff --git a/abby.spec b/abby.spec index dc53193..71611cf 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.6.1 +Version: 0.4.7 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 18 2009 Nicoleau Fabien 0.4.7-1 +- Update to 0.4.7 * Sun Dec 6 2009 Nicoleau Fabien 0.4.6.1-1 - Update to 0.4.6.1 * Sat Nov 28 2009 Nicoleau Fabien 0.4.5-1 diff --git a/sources b/sources index 2c296cf..57ef4e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8ca71a7c4a07b4aa1c51bc1b66d24d7 abby-0.4.6.1.tar.bz2 +c9ed01675da814435dc60fde5c38b9ec abby-0.4.7.tar.bz2 From 484142dc27a4fb70818aa8963ca5ee6f59fb9bdc Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Thu, 21 Jan 2010 19:45:11 +0000 Subject: [PATCH 12/13] Update to 0.4.8 --- .cvsignore | 2 +- abby.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index be45910..d7ab5c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abby-0.4.7.tar.bz2 +abby-0.4.8.tar.bz2 diff --git a/abby.spec b/abby.spec index 71611cf..4a72d5f 100644 --- a/abby.spec +++ b/abby.spec @@ -1,5 +1,5 @@ Name: abby -Version: 0.4.7 +Version: 0.4.8 Release: 1%{?dist} Summary: Front-end for cclive and clive @@ -49,12 +49,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README TODO +%doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %changelog +* Thu Jan 21 2010 Nicoleau Fabien 0.4.8-1 +- Update to 0.4.8 * Fri Dec 18 2009 Nicoleau Fabien 0.4.7-1 - Update to 0.4.7 * Sun Dec 6 2009 Nicoleau Fabien 0.4.6.1-1 diff --git a/sources b/sources index 57ef4e3..5763092 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9ed01675da814435dc60fde5c38b9ec abby-0.4.7.tar.bz2 +22cfd98ea16a4f02640af5b0cadcaa91 abby-0.4.8.tar.bz2 From bf934a027ca28cb445053a8b92f94db81c38612f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:15 +0000 Subject: [PATCH 13/13] 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 d13ee1e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abby -# $Id$ -NAME := abby -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index f2b81b5..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -abby-0_2_0-2_fc10:F-11:abby-0.2.0-2.fc10.src.rpm:1240520513