Compare commits

...

2 Commits
rawhide ... f15

Author SHA1 Message Date
Pavel Zhukov
3bfc7f688c New upstream release (#700997) 2011-05-03 10:44:13 +04:00
Pavel Zhukov
ba6ea6f39d Update to new upstream release 2011-03-27 17:07:25 +04:00
6 changed files with 29 additions and 84 deletions

2
.gitignore vendored
View File

@ -1 +1,3 @@
/mupdf-0.7.tar.gz
/mupdf-0.8.15-source.tar.gz
/mupdf-0.8.165-source.tar.gz

View File

@ -1,23 +0,0 @@
--- a/Makefile 2011-01-13 23:10:08.911556954 +0300
+++ b/Makefile 2011-01-13 23:12:43.329510332 +0300
@@ -36,6 +36,7 @@
include Makerules
include Makethird
+CFLAGS ?=
CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_INC)
#
--- a/Makerules 2010-08-25 18:12:08.000000000 +0400
+++ b/Makerules 2011-01-13 23:31:10.535045464 +0300
@@ -4,7 +4,8 @@
OS := $(OS:MINGW%=MINGW)
CC ?= cc
-CFLAGS := -Ifitz -Imupdf -Wall
+CFLAGS ?=
+CFLAGS += -Ifitz -Imupdf -Wall
LDFLAGS :=
ifeq "$(build)" "debug"

View File

@ -1,20 +0,0 @@
--- a/Makefile 2011-02-06 00:31:40.957428001 +0300
+++ b/Makefile 2011-02-06 00:32:37.597428002 +0300
@@ -7,6 +7,7 @@
build ?= debug
prefix ?= /usr/local
+LIBDIR ?= $(prefix)/lib
OBJDIR := build/$(build)
GENDIR := build/generated
@@ -378,7 +379,7 @@
rm -rf build
install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
+ install -d $(prefix)/bin $(LIBDIR) $(prefix)/include
install $(APPS) $(prefix)/bin
- install $(MUPDF_LIB) $(prefix)/lib
+ install $(MUPDF_LIB) $(MUPDF_SO_LIB) $(LIBDIR)
install $(MUPDF_HDR) $(prefix)/include

View File

@ -1,11 +0,0 @@
--- a/Makefile 2011-02-06 00:26:25.906428001 +0300
+++ b/Makefile 2011-02-06 00:26:37.584428000 +0300
@@ -336,7 +336,7 @@
PDFINFO_SRC=apps/pdfinfo.c
PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o)
-PDFINFO_EXE=$(OBJDIR)/pdfinfo
+PDFINFO_EXE=$(OBJDIR)/pdfinfo-mupdf
$(PDFINFO_OBJ): $(MUPDF_HDR)
$(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
$(LD_CMD)

View File

@ -1,16 +1,13 @@
Name: mupdf
Version: 0.7
Release: 8%{?dist}
Version: 0.8.165
Release: 2%{?dist}
Summary: A lightweight PDF viewer and toolkit
Group: Applications/Publishing
License: GPLv3
URL: http://mupdf.com/
Source0: http://mupdf.com/download/%{name}-%{version}.tar.gz
Source0: http://mupdf.com/download/%{name}-%{version}-source.tar.gz
Source1: %{name}.desktop
Patch1: %{name}-pdfinfo.patch
Patch2: %{name}-libdir.patch
Patch3: %{name}-cflags.patch
BuildRequires: openjpeg-devel jbig2dec-devel desktop-file-utils
BuildRequires: libjpeg-devel freetype-devel libXext-devel
@ -41,29 +38,21 @@ applications that use mupdf and static libraries
%prep
%setup -q
## http://bugs.ghostscript.com/show_bug.cgi?id=691884
%patch1 -p1
## http://bugs.ghostscript.com/show_bug.cgi?id=691885
%patch2 -p1
%patch3 -p1
%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags} verbose=1
%install
make DESTDIR=%{buildroot} install prefix=%{buildroot}/usr LIBDIR=%{buildroot}%{_libdir}
make DESTDIR=%{buildroot} install prefix=%{buildroot}/usr libdir=%{buildroot}%{_libdir}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
install -D -m644 debian/%{name}.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm
install -D -m644 debian/pdfshow.1 %{buildroot}/%{_mandir}/man1/%{name}.1
install -D -m644 debian/pdfshow.1 %{buildroot}/%{_mandir}/man1/pdfshow.1
install -D -m644 debian/pdfdraw.1 %{buildroot}/%{_mandir}/man1/pdfdraw.1
install -D -m644 debian/pdfclean.1 %{buildroot}/%{_mandir}/man1/pdfclean.1
## filename conflict with poppler
mv %{buildroot}%{_bindir}/pdfinfo %{buildroot}%{_bindir}/pdfinfo-mupdf
## fix strange permissons
chmod 0644 %{buildroot}/%{_includedir}/%{name}.h
chmod 0644 %{buildroot}/%{_includedir}/fitz.h
chmod 0644 %{buildroot}%{_libdir}/libmupdf.a
chmod 0644 %{buildroot}/%{_includedir}/*.h
chmod 0644 %{buildroot}%{_libdir}/*.a
find %{buildroot}/%{_mandir} -type f -exec chmod 0644 {} \;
%post
update-desktop-database &> /dev/null || :
@ -78,40 +67,48 @@ update-desktop-database &> /dev/null || :
%{_bindir}/pdfclean
%{_bindir}/pdfdraw
%{_bindir}/pdfextract
%{_bindir}/pdfinfo-%{name}
%{_bindir}/pdfshow
%{_bindir}/pdfinfo-mupdf
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.xpm
%{_mandir}/man?/*.1*
%{_bindir}/xpsdraw
%files devel
%defattr(-,root,root,-)
%{_includedir}/fitz.h
%{_includedir}/%{name}.h
%{_includedir}/muxps.h
%{_libdir}/libfitz.a
%{_libdir}/libmupdf.a
%{_libdir}/libmuxps.a
%changelog
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue May 03 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.8.165-2
- New upstream release
- Fix *.a and *.h permissions
* Tue Feb 9 2011 Pavel Zhukov <pavel@zhukoff.net> - 0.7-7
* Sun Mar 27 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.8.15-1
- New upstream release
* Tue Feb 9 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-7
- Fix dependency for F13
* Sun Feb 7 2011 Pavel Zhukov <pavel@zhukoff.net> - 0.7-6
* Sun Feb 7 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-6
- roll back to static libraries patch for shared libs has been rejected
- Fix spec errors
* Fri Jan 14 2011 Pavel Zhukov <pavel@zhukoff.net> - 0.7-4
* Fri Jan 14 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-4
- replac poitless macros to command names
* Fri Jan 14 2011 Pavel Zhukov <pavel@zhukoff.net> - 0.7-3
* Fri Jan 14 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-3
- Create patch for optflags
- Change Summary
- Fix Require for devel package
* Thu Jan 13 2011 Pavel Zhukov <pavel@zhukoff.net> -0.7-2
* Thu Jan 13 2011 Pavel Zhukov <landgraf@fedoraproject.org> -0.7-2
- add Fedora CFLAGS
- create patch for use shared library
* Wed Jan 12 2011 Pavel Zhukov <pavel@zhukoff.net> - 0.7-1
* Wed Jan 12 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-1
- Initial package

View File

@ -1 +1 @@
83adc4d14eb17835df791a9a0d1e8fa9 mupdf-0.7.tar.gz
a95813737924e60d87a944d52b6a5120 mupdf-0.8.165-source.tar.gz