rpms/fbreader/F-7 fbreader-debug.patch, NONE, 1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch, NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz