From f894b5eab191e3f45489145ec0709504ec3f3bf9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 16 Feb 2009 21:15:35 +0000 Subject: [PATCH 1/7] Initialize branch F-9 for impressive --- 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 618a3bcdb04b56569f2c8f1d1253cff3e4b3c3fa Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Mon, 16 Feb 2009 22:11:07 +0000 Subject: [PATCH 2/7] First import for F-9 --- .cvsignore | 1 + import.log | 1 + impressive.sh | 9 ++++++ impressive.spec | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 97 insertions(+) create mode 100644 import.log create mode 100755 impressive.sh create mode 100644 impressive.spec diff --git a/.cvsignore b/.cvsignore index e69de29..d35553c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Impressive-0.10.2.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..aac9e7c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +impressive-0_10_2-3_fc10:F-9:impressive-0.10.2-3.fc10.src.rpm:1234822084 diff --git a/impressive.sh b/impressive.sh new file mode 100755 index 0000000..c9e7a37 --- /dev/null +++ b/impressive.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +. /usr/share/opengl-games-utils/opengl-game-functions.sh + +APP=python-impressive + +checkDriOK $APP + +exec $APP "$@" diff --git a/impressive.spec b/impressive.spec new file mode 100644 index 0000000..541189a --- /dev/null +++ b/impressive.spec @@ -0,0 +1,85 @@ +Name: impressive +Version: 0.10.2 +Release: 3%{?dist} +Summary: The stylish way of giving presentations + +Group: Applications/Productivity +License: GPLv2 +URL: http://impressive.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz +Source1: %{name}.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +Requires: python-imaging +Requires: pygame +Requires: PyOpenGL +Requires: opengl-games-utils +Requires: xpdf +Requires: xdg-utils +Requires: opengl-games-utils + +%if 0%{?fedora} > 10 +Requires: dejavu-sans-fonts +%endif + +%if 0%{?fedora} == 10 +Requires: dejavu-fonts-sans +%endif + +%if 0%{?fedora} == 9 +Requires: dejavu-fonts +%endif + + +%description +Impressive is a program that displays presentation slides. But unlike +OpenOffice.org Impress or other similar applications, it does so with +style. + +Smooth alpha-blended slide transitions are provided for the sake +of eye candy, but in addition to this, Impressive offers some unique tools +that are really useful for presentations. + + +%prep +%setup -q -n Impressive-%{version} + + +%build +# This package don't build anything, just copy files under build root. + + +%install +rm -rf $RPM_BUILD_ROOT +install -D -p -m 755 impressive.py $RPM_BUILD_ROOT%{_bindir}/python-impressive +install -D -p -m 644 impressive.1 $RPM_BUILD_ROOT%{_mandir}/man1/impressive.1 +cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc changelog.txt demo.pdf impressive.html license.txt +%{_bindir}/%{name} +%{_bindir}/python-%{name} +%{_mandir}/man1/* + +%changelog +* Mon Feb 16 2009 Allisson Azevedo 0.10.2-4 +- Fix requires for dejavu fonts. + +* Thu Feb 12 2009 Allisson Azevedo 0.10.2-3 +- Added OpenGL wrapper. +- Fix requires for dejavu fonts. + +* Thu Feb 12 2009 Allisson Azevedo 0.10.2-2 +- Changed license. +- Added dejavu-fonts to requires. +- Added build section. + +* Mon Feb 9 2009 Allisson Azevedo 0.10.2-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..63505ad 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +492eda5e3e09beb2f6dc997ed94f5349 Impressive-0.10.2.tar.gz From 9f9749d895af9e75fd54978a4308e4fbdc46b5f8 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Tue, 17 Feb 2009 17:34:32 +0000 Subject: [PATCH 3/7] Fix requires for dejavu fonts. --- import.log | 1 + impressive.spec | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/import.log b/import.log index aac9e7c..a8489c4 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ impressive-0_10_2-3_fc10:F-9:impressive-0.10.2-3.fc10.src.rpm:1234822084 +impressive-0_10_2-4_fc10:F-9:impressive-0.10.2-4.fc10.src.rpm:1234891840 diff --git a/impressive.spec b/impressive.spec index 541189a..1d4907f 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The stylish way of giving presentations Group: Applications/Productivity @@ -23,11 +23,7 @@ Requires: opengl-games-utils Requires: dejavu-sans-fonts %endif -%if 0%{?fedora} == 10 -Requires: dejavu-fonts-sans -%endif - -%if 0%{?fedora} == 9 +%if 0%{?fedora} <= 10 Requires: dejavu-fonts %endif From ebb9e1c34ba6d3284c89b04e8b3e63b9a3b99bc2 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Wed, 18 Feb 2009 11:42:02 +0000 Subject: [PATCH 4/7] Obsolete keyjnote --- import.log | 1 + impressive.spec | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index a8489c4..c84d5a8 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ impressive-0_10_2-3_fc10:F-9:impressive-0.10.2-3.fc10.src.rpm:1234822084 impressive-0_10_2-4_fc10:F-9:impressive-0.10.2-4.fc10.src.rpm:1234891840 +impressive-0_10_2-5_fc10:F-9:impressive-0.10.2-5.fc10.src.rpm:1234957133 diff --git a/impressive.spec b/impressive.spec index 1d4907f..24f522c 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The stylish way of giving presentations Group: Applications/Productivity @@ -27,6 +27,8 @@ Requires: dejavu-sans-fonts Requires: dejavu-fonts %endif +Obsoletes: keyjnote <= 0.10.2-2 + %description Impressive is a program that displays presentation slides. But unlike @@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Mon Feb 16 2009 Allisson Azevedo 0.10.2-5 +- Obsolete keyjnote. + * Mon Feb 16 2009 Allisson Azevedo 0.10.2-4 - Fix requires for dejavu fonts. From 5a7eca12f32c03410f10af3bd83b282c93062a07 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Thu, 19 Feb 2009 12:39:26 +0000 Subject: [PATCH 5/7] Added provides keyjnote. --- import.log | 1 + impressive.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index c84d5a8..23e6973 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ impressive-0_10_2-3_fc10:F-9:impressive-0.10.2-3.fc10.src.rpm:1234822084 impressive-0_10_2-4_fc10:F-9:impressive-0.10.2-4.fc10.src.rpm:1234891840 impressive-0_10_2-5_fc10:F-9:impressive-0.10.2-5.fc10.src.rpm:1234957133 +impressive-0_10_2-6_fc10:F-9:impressive-0.10.2-6.fc10.src.rpm:1235046963 diff --git a/impressive.spec b/impressive.spec index 24f522c..8fd28ab 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The stylish way of giving presentations Group: Applications/Productivity @@ -27,7 +27,8 @@ Requires: dejavu-sans-fonts Requires: dejavu-fonts %endif -Obsoletes: keyjnote <= 0.10.2-2 +Provides: keyjnote = %{version}-%{release} +Obsoletes: keyjnote < 0.10.2-3 %description @@ -67,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Thu Feb 19 2009 Allisson Azevedo 0.10.2-6 +- Added provides keyjnote. + * Mon Feb 16 2009 Allisson Azevedo 0.10.2-5 - Obsolete keyjnote. From c5d5d91208db6696e382c808fe9dfa06ff5da659 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:20:30 +0000 Subject: [PATCH 6/7] 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 ae83d1e..e005991 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: impressive -# $Id$ +# $Id: Makefile,v 1.1 2009/02/16 21:15:32 kevin Exp $ NAME := impressive 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 b399be9364c2e5609235e76174cd30705af9d0e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:14:31 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 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 e005991..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: impressive -# $Id: Makefile,v 1.1 2009/02/16 21:15:32 kevin Exp $ -NAME := impressive -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 23e6973..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -impressive-0_10_2-3_fc10:F-9:impressive-0.10.2-3.fc10.src.rpm:1234822084 -impressive-0_10_2-4_fc10:F-9:impressive-0.10.2-4.fc10.src.rpm:1234891840 -impressive-0_10_2-5_fc10:F-9:impressive-0.10.2-5.fc10.src.rpm:1234957133 -impressive-0_10_2-6_fc10:F-9:impressive-0.10.2-6.fc10.src.rpm:1235046963