From 79ef1bc3398f493d65a9a42b192b3334bc04906d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 Apr 2009 16:44:25 +0000 Subject: [PATCH 1/8] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 6c1d8e2983eeed8af8e25d9404f621dbaa6d1ac5 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Thu, 23 Apr 2009 21:03:58 +0000 Subject: [PATCH 2/8] 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..e382a2c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +abby-0_2_0-2_fc10:F-10:abby-0.2.0-2.fc10.src.rpm:1240520616 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 cb38206ff5a71e2f1b298ea1542ecd8ccc02d0ed Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Fri, 8 May 2009 20:59:47 +0000 Subject: [PATCH 3/8] 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 807d6429c4d5aaa9fc72a5f5269a70a09961c10e Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 11 Jul 2009 23:24:58 +0000 Subject: [PATCH 4/8] 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 ef67ca16fd3a9efbb3f15c503b3fec90f9848ef0 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Mon, 3 Aug 2009 13:40:59 +0000 Subject: [PATCH 5/8] 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 9dd3d007e2ef87c778959a2b923ce508ac50309d Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Sat, 5 Sep 2009 14:52:12 +0000 Subject: [PATCH 6/8] 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 f2cf1ab3186d19a0f44b012a2f9d5c1210e13a7d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:07 +0000 Subject: [PATCH 7/8] 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 d6570d133ec43e65af23bdfbe4ac3fc3682953fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:12 +0000 Subject: [PATCH 8/8] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index e382a2c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -abby-0_2_0-2_fc10:F-10:abby-0.2.0-2.fc10.src.rpm:1240520616