From 10379049e8be8d36ab36bce873bc8806fe54def5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:17 +0000 Subject: [PATCH 1/3] 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 9387543..aac7fc7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wv2 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 441d52460faf9381513ae508fc3ffe62879149e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Mar 2010 03:12:09 +0000 Subject: [PATCH 2/3] wv2 is now shipped as part of koffice (as of koffice-2.1.81) --- .cvsignore | 1 - dead.package | 1 + sources | 1 - wv2-0.4.0-extra_libs.patch | 12 --- wv2-0.4.0-multilib.patch | 18 ---- wv2.spec | 175 ------------------------------------- 6 files changed, 1 insertion(+), 207 deletions(-) create mode 100644 dead.package delete mode 100644 wv2-0.4.0-extra_libs.patch delete mode 100644 wv2-0.4.0-multilib.patch delete mode 100644 wv2.spec diff --git a/.cvsignore b/.cvsignore index 2af7413..e69de29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +0,0 @@ -wv2-0.4.1.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..73c7473 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +wv2 is now shipped as part of koffice (as of koffice-2.1.81) diff --git a/sources b/sources index 26807ea..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -7565fcc392c8869c44a301992b3ea561 wv2-0.4.1.tar.bz2 diff --git a/wv2-0.4.0-extra_libs.patch b/wv2-0.4.0-extra_libs.patch deleted file mode 100644 index 112e22b..0000000 --- a/wv2-0.4.0-extra_libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wv2-0.4.0/wv2-config.cmake.extra_libs wv2-0.4.0/wv2-config.cmake ---- wv2-0.4.0/wv2-config.cmake.extra_libs 2009-08-26 16:46:40.000000000 -0500 -+++ wv2-0.4.0/wv2-config.cmake 2009-09-11 09:36:48.155394840 -0500 -@@ -76,7 +76,7 @@ if test "$echo_exec_prefix" = "yes"; the - echo $exec_prefix - fi - --wv2_libs="@WV2_LDFLAGS@ -lwv2 @WV2_LIBS@" -+wv2_libs="-lwv2" - - if test "$echo_cflags" = "yes"; then - includes="@WV2_CFLAGS@" diff --git a/wv2-0.4.0-multilib.patch b/wv2-0.4.0-multilib.patch deleted file mode 100644 index 5c3e05c..0000000 --- a/wv2-0.4.0-multilib.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up wv2-0.4.0/wv2-config.cmake.multilib wv2-0.4.0/wv2-config.cmake ---- wv2-0.4.0/wv2-config.cmake.multilib 2009-09-11 09:38:24.415620835 -0500 -+++ wv2-0.4.0/wv2-config.cmake 2009-09-11 09:43:19.806622445 -0500 -@@ -87,7 +87,6 @@ if test "$echo_cflags" = "yes"; then - fi - - if test "$echo_libs" = "yes"; then -- libdirs=-L${exec_prefix}/lib - my_wv2_libs= - for i in $wv2_libs ; do - if test "x$i" != "x-L${exec_prefix}/lib" ; then -@@ -99,5 +98,5 @@ if test "$echo_libs" = "yes"; then - fi - done - -- echo $libdirs $my_wv2_libs -+ echo $my_wv2_libs - fi diff --git a/wv2.spec b/wv2.spec deleted file mode 100644 index e48b071..0000000 --- a/wv2.spec +++ /dev/null @@ -1,175 +0,0 @@ - -Name: wv2 -Epoch: 1 -Version: 0.4.1 -Release: 3%{?dist} -Summary: A library which allows access to Microsoft Word files - -Group: System Environment/Libraries -License: LGPLv2 -URL: http://wvware.sourceforge.net -Source0: http://downloads.sourceforge.net/sourceforge/wvware/wv2-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# see bug #192291 -Patch2: wv2-0.4.0-extra_libs.patch -# see bug #343451 -Patch3: wv2-0.4.0-multilib.patch - -BuildRequires: cmake -BuildRequires: libgsf-devel -BuildRequires: libxml2-devel -BuildRequires: pkgconfig -BuildRequires: glib2-devel -BuildRequires: zlib-devel - -%description -wv is a library which allows access to Microsoft Word files. It can load and -parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known -internally as Word 9, 8, 7 and 6.) There is some support for reading earlier -formats as well: Word 2 docs are converted to plaintext. - -%package devel -Summary: Development tools for programs which will use the wv2 library -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: libgsf-devel -Requires: glib2-devel -Requires: libxml2-devel -%description devel -The wv2-devel package includes the header files necessary for developing. - - -%prep -%setup -q - -%patch2 -p1 -b .extra_libs -%patch3 -p1 -b .multilib - - -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} - -# unpackaged files -rm -f %{buildroot}%{_libdir}/lib*.la - - -%check -pushd %{_target_platform} -# checks currently fail on ppc64, appears to be a toolchain prob -%ifarch ppc64 -make -k test -C ||: -%else -make -k test -%endif -popd - - -%clean -rm -rf %{buildroot} - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO -%{_libdir}/libwv2.so.4* -%dir %{_libdir}/wvWare/ - -%files devel -%defattr(-,root,root,-) -%doc doc/* -%{_bindir}/wv2-config -%{_libdir}/libwv2.so -%{_libdir}/wvWare/wv2-noconfig.cmake -%{_libdir}/wvWare/wv2.cmake -%{_includedir}/wv2/ - - -%changelog -* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-3 -- fix epoch-related deps - -* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-2 -- Epoch: 1 - -* Fri Oct 09 2009 Rex Dieter - 0.4.1-1 -- wv2-0.4.1 (ABI bump) - -* Fri Sep 11 2009 Rex Dieter - 0.4.0-1 -- wv2-0.4.0 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 22 2008 Andreas Bierfert - 0.2.3-7 -- fix gcc43 build (#433999) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-6 -- Autorebuild for GCC 4.3 - -* Mon Feb 11 2008 Andreas Bierfert - 0.2.3-5 -- Rebuilt for gcc43 - -* Fri Jan 04 2008 Andreas Bierfert 0.2.3-4 -- fix #343451 multiarch - -* Thu Aug 23 2007 Andreas Bierfert 0.2.3-3 -- new license tag -- rebuild for buildid - -* Fri Sep 15 2006 Andreas Bierfert 0.2.3-2 -- FE6 rebuild -- fix BR - -* Sun Jun 18 2006 Andreas Bierfert 0.2.3-1 -- version upgrade -- fix #195019 (CVE-2006-2197) - -* Wed Mar 22 2006 Andreas Bierfert 0.2.2-9 -- bump for libgsf - -* Tue Feb 21 2006 Andreas Bierfert 0.2.2-8 -- Fix #19229{1,3} -- Tune configure - -* Thu Feb 16 2006 Andreas Bierfert 0.2.2-7 -- Rebuild for Fedora Extras 5 - -* Tue Dec 13 2005 Andreas Bierfert 0.2.2-6 -- rebuild - -* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 -- add dist tag - -* Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 -- add some Requires for the devel package -- changed some files around -- added missing defattr to devel package - -* Thu Jun 30 2005 Andreas Bierfert 0.2.2-3 -- drop explicit Requires for ldconfig - -* Wed Jun 29 2005 Andreas Bierfert 0.2.2-2 -- added trademarks -- added missing ldconfig - -* Sun Jun 26 2005 Andreas Bierfert 0.2.2-1 -- Initial Release From 1325c92298625a37f305c737ce294ec1e095c28e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:49 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 aac7fc7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wv2 -# $Id$ -NAME := wv2 -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)