From a8a782f235681c5ad9a6b80f8ad3cbd056b457d7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:47 +0000 Subject: [PATCH 1/7] Initialize branch F-12 for libass --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From b34f0d9bfb65ada85f66ce5a673a2a5587c0485e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:45:34 +0000 Subject: [PATCH 2/7] 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 fb71281..601c9b0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libass 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 1e4104e5a2c69260dbfb6d7c7fcfc78c1db757c4 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Sun, 10 Jan 2010 21:02:22 +0000 Subject: [PATCH 3/7] fix source URL, sync f11/12 with devel --- libass.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libass.spec b/libass.spec index ca158aa..1741d1f 100644 --- a/libass.spec +++ b/libass.spec @@ -1,12 +1,12 @@ Name: libass -Version: 0.9.7 -Release: 1%{?dist} +Version: 0.9.8 +Release: 2%{?dist} Summary: Portable library for SSA/ASS subtitles rendering Group: System Environment/Libraries License: GPLv2+ URL: http://code.google.com/p/libass/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://libass.googlecode.com/files/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +64,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libass.pc %changelog +* Sun Jan 10 2009 Martin Sourada - 0.9.8-2 +- Fix source URL + +* Sun Oct 25 2009 Martin Sourada - 0.9.8-1 +- New upstream release +- See http://repo.or.cz/w/libass.git?a=blob;f=Changelog for changes + * Mon Aug 10 2009 Martin Sourada - 0.9.7-1 - New upstream release - Upstream changed from sourceforge to code.google From 4f1ae5de363608349887b67edbeb533920fdd0ab Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:49:53 +0000 Subject: [PATCH 4/7] Initialize branch F-13 for libass --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 2fa7a0cdccebde20532d8f71fd10ef990eec5713 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:42:35 +0000 Subject: [PATCH 5/7] 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 601c9b0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libass -# $Id$ -NAME := libass -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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index acdfa77..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libass-0_9_6-2_fc10:HEAD:libass-0.9.6-2.fc10.src.rpm:1237917106 From 31bcadcdfa9068fe6c4ec889d2437b305c1bd8b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:42:36 +0000 Subject: [PATCH 6/7] 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 601c9b0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libass -# $Id$ -NAME := libass -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index acdfa77..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libass-0_9_6-2_fc10:HEAD:libass-0.9.6-2.fc10.src.rpm:1237917106 From ea834f5a8eb951cd7bfb6d84167647216f0cf8dd Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Fri, 30 Jul 2010 10:40:21 +0200 Subject: [PATCH 7/7] update sources and .gitignore, fix a typo in %changelog date. --- .gitignore | 2 +- libass.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7e5be0..8260ead 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libass-0.9.7.tar.bz2 +libass-0.9.8.tar.bz2 diff --git a/libass.spec b/libass.spec index 1741d1f..8bf2704 100644 --- a/libass.spec +++ b/libass.spec @@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libass.pc %changelog -* Sun Jan 10 2009 Martin Sourada - 0.9.8-2 +* Sun Jan 10 2010 Martin Sourada - 0.9.8-2 - Fix source URL * Sun Oct 25 2009 Martin Sourada - 0.9.8-1 diff --git a/sources b/sources index edca5f2..8a3be04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28b0de58dec54ca75c3195ddda46ee3d libass-0.9.7.tar.bz2 +e0b0c81f2e2651408e72b02473d35cde libass-0.9.8.tar.bz2