From f765323df75d5bde4bbc4ab7a24c05f463266ec9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:09 +0000 Subject: [PATCH 1/4] 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 d1d459a..8cfddb7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wine-docs 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 8e9b9fd1d45e011685090685dfb82707943b88b9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:28:30 +0000 Subject: [PATCH 2/4] Initialize branch EL-6 for wine-docs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 6c455e14fb7458ade87a67d1772dfb48e4c8eeef Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Thu, 22 Jul 2010 18:06:38 +0000 Subject: [PATCH 3/4] - version upgrade --- .cvsignore | 2 +- sources | 2 +- wine-build.patch | 34 ++++++++++++++++++++++++++++++++++ wine-docs.spec | 12 ++++++++++-- 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 wine-build.patch diff --git a/.cvsignore b/.cvsignore index 6dd4634..917c36d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-docs-1.0.tar.bz2 +wine-docs-1.2.tar.bz2 diff --git a/sources b/sources index 690eeb7..a596f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53e626174eb3f38d2cab8381b9ee1e50 wine-docs-1.0.tar.bz2 +9428acc48b72be9476d59d468da2ea3f wine-docs-1.2.tar.bz2 diff --git a/wine-build.patch b/wine-build.patch new file mode 100644 index 0000000..5c0d80d --- /dev/null +++ b/wine-build.patch @@ -0,0 +1,34 @@ +--- en/winedev-testing.sgml.orig 2010-07-22 19:47:32.000000000 +0200 ++++ en/winedev-testing.sgml 2010-07-22 19:47:50.000000000 +0200 +@@ -205,7 +205,8 @@ + The following step should probably work on any rpm based system. + + +- Run yum install mingw32-gcc. ++ Run yum install mingw32-gcc. ++ + + + *BSD +--- en/wineusr-configuring.sgml.orig 2010-07-22 19:57:14.000000000 +0200 ++++ en/wineusr-configuring.sgml 2010-07-22 19:57:48.000000000 +0200 +@@ -223,9 +223,7 @@ + Most often applications will assume that a required redistributable + package has already been installed and subsequently fail to run when + the required dependencies are not met. For example: +- + err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found +- + + + Redistributable packages which install the necessary runtimes can +--- en/wineusr-configuring.sgml.orig 2010-07-22 19:59:06.000000000 +0200 ++++ en/wineusr-configuring.sgml 2010-07-22 20:00:07.000000000 +0200 +@@ -219,6 +219,7 @@ + this file is a publicly available DLL or a custom DLL belonging + to your program. In the latter case, check that you have installed + your program correctly. ++ + + Most often applications will assume that a required redistributable + package has already been installed and subsequently fail to run when diff --git a/wine-docs.spec b/wine-docs.spec index a921153..fcf67bc 100644 --- a/wine-docs.spec +++ b/wine-docs.spec @@ -1,13 +1,16 @@ %define debug_package %{nil} Name: wine-docs -Version: 1.0 -Release: 3%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPLv2+ URL: http://www.winehq.org Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-%{version}.tar.bz2 + +Patch0: wine-build.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -19,6 +22,7 @@ various guides and their translations. %prep %setup -q -n %{name}-%{version} +%patch0 %build ./configure @@ -37,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Thu Jul 22 2010 Andreas Bierfert +- 1.2-1 +- version upgrade + * Mon Jul 27 2009 Fedora Release Engineering - 1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 5017dc2aad239fcff6889bbfc2cce3d028be8810 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:20:25 +0000 Subject: [PATCH 4/4] 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 8cfddb7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wine-docs -# $Id$ -NAME := wine-docs -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6