[wxpdfdoc] Updated to new upstream version.
Domingo Becker
beckerde at fedoraproject.org
Mon Dec 24 03:19:43 UTC 2012
commit 9e9221d2153ca6a42dfd5a810e2cc9cd611f2b9a
Author: Domingo Becker <domingobecker at gmail.com>
Date: Mon Dec 24 00:19:19 2012 -0300
Updated to new upstream version.
.gitignore | 1 +
GNUmakefile.patch | 19 +++++++++++++++----
sources | 2 +-
wxpdfdoc.spec | 16 ++++++++++++----
4 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53f3e27..4845df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/wxpdfdoc-0.9.2.1.tar.gz
+/wxpdfdoc-0.9.3.tar.gz
diff --git a/GNUmakefile.patch b/GNUmakefile.patch
index 74306b7..564dc00 100644
--- a/GNUmakefile.patch
+++ b/GNUmakefile.patch
@@ -1,6 +1,8 @@
---- build/GNUmakefile 2011-09-16 17:22:45.000000000 -0300
-+++ build/GNUmakefile 2012-05-16 14:17:32.763992228 -0300
-@@ -19,6 +19,8 @@
+diff --git a/build/GNUmakefile b/build/GNUmakefile
+index 207de2b..a781fc2 100755
+--- a/build/GNUmakefile
++++ b/build/GNUmakefile
+@@ -19,6 +19,8 @@ prefix ?= /usr/local
# Destination root (/ is used if empty)
DESTDIR ?=
@@ -9,7 +11,7 @@
#
AR ?= ar
-@@ -519,11 +521,9 @@
+@@ -524,11 +526,9 @@ make_dir_pdfdoc_dll:
ifeq ($(WX_SHARED),1)
install_pdfdoc_dll_headers:
$(INSTALL) -d $(DESTDIR)$(prefix)
@@ -23,3 +25,12 @@
done
endif
+@@ -543,7 +543,7 @@ endif
+ $(CXX) -o $@ $(MINIMAL_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`
+
+ ../samples/pdfdc/printing: $(DCSAMPLE_OBJECTS) $(__COMPONENT_LIB_DEP)
+- $(CXX) -o $@ $(DCSAMPLE_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`
++ $(CXX) -o $@ $(DCSAMPLE_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base,richtext,html`
+
+ ../makefont/makefont: $(MAKEFONT_OBJECTS) $(__COMPONENT_LIB_DEP)
+ $(CXX) -o $@ $(MAKEFONT_OBJECTS) $(VAR_7) -L../lib $(LDFLAGS) $(__COMPONENT_LIB_LIBR) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,core,base`
diff --git a/sources b/sources
index 04df513..e240409 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c664be9f77cd422e7d6f5034aa93e675 wxpdfdoc-0.9.2.1.tar.gz
+0c853fdf7ad19f936431b15e679c0361 wxpdfdoc-0.9.3.tar.gz
diff --git a/wxpdfdoc.spec b/wxpdfdoc.spec
index bce4713..4530f2a 100644
--- a/wxpdfdoc.spec
+++ b/wxpdfdoc.spec
@@ -1,6 +1,6 @@
Name: wxpdfdoc
-Version: 0.9.2.1
-Release: 4%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
Summary: A library for creating PDF documents in C++ with wxWidgets
Group: System Environment/Libraries
License: wxWidgets
@@ -47,7 +47,8 @@ chmod 644 docs/html/*
chmod 644 src/*.cpp src/*.h src/*.inc
chmod 644 include/wx/*.h
sed -i.orig -e 's|$(prefix)/lib|$(prefix)/%{_lib}|g' build/GNUmakefile
-%patch
+%patch -p 1
+rm -f docs/Doxyfile
%build
@@ -69,14 +70,21 @@ make -C build prefix=$RPM_BUILD_ROOT%{_prefix} WXINCLUDEDIR=%{_inclwxdir} instal
%files
%{_libdir}/libwxcode_gtk2_pdfdoc*
-%doc LICENCE.txt Readme.txt docs/*
+%doc LICENCE.txt
%files devel
%{_includedir}%{_wxdir}/pdf*
+%doc Readme.txt docs/*
%changelog
+* Mon Dec 24 2012 Domingo Becker <domingobecker at gmail.com> - 0.9.3-1
+- Updated to latest upstream version.
+- Moved Readme.txt and docs/html to -devel package (Bug #889889).
+- Removed Doxyfile from installed package (Bug #889889).
+- Updated patch for build/GNUmakefile for the new version and to fix a missing library problem with samples/pdfdc/printing.
+
* Sun Oct 28 2012 Domingo Becker <domingobecker at gmail.com> - 0.9.2.1-4
- Removed BuildRoot definition.
- Removed initial cleaning of buildroot in install section.
More information about the scm-commits
mailing list