Hello community, here is the log from the commit of package fbreader for openSUSE:Factory checked in at Thu Sep 1 16:04:06 CEST 2011.
-------- --- fbreader/fbreader.changes 2011-08-24 00:25:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/fbreader/fbreader.changes 2011-08-31 02:57:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 31 00:53:19 UTC 2011 - [email protected] + +- cleaned spec using spec-cleaner +- fixed generic-name-not-in-filelist RPMLINT warning + +------------------------------------------------------------------- @@ -5 +11 @@ -- use alternatives to select user interface (based of Fedora spec) +- used alternatives to select user interface (based of Fedora spec) calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fbreader.spec ++++++ --- /var/tmp/diff_new_pack.meFqMc/_old 2011-09-01 16:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.meFqMc/_new 2011-09-01 16:03:23.000000000 +0200 @@ -18,28 +18,35 @@ Name: fbreader -Summary: E-book reader -Group: Productivity/Other Version: 0.12.10 -Release: 1 +Release: 3 License: GPLv2+ +Summary: E-book reader Url: http://www.fbreader.org/ +Group: Productivity/Other Source0: fbreader-%{version}.tar.bz2 Source1: FBReader.desktop Source2: README.SuSE Source3: fbreader.xml +# PATCH-FIX-UPSTREAM fbreader-0.12.10-c++.patch http://www.fbreader.org/mantis/view.php?id=283 -- fix build with gcc 4.5 Patch0: fbreader-0.12.10-c++.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: zlibrary = %{version} +%if 0%{?suse_version} BuildRequires: update-desktop-files +%endif +BuildRequires: enca-devel +BuildRequires: expat BuildRequires: fdupes -BuildRequires: enca-devel expat liblinebreak-devel zlib-devel -BuildRequires: gcc-c++ gtk2-devel -BuildRequires: libqt4-devel -BuildRequires: sqlite3-devel BuildRequires: fribidi-devel +BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libexpat-devel -Requires: zlibrary = %{version}-%{release} +BuildRequires: liblinebreak-devel +BuildRequires: libqt4-devel +BuildRequires: sqlite3-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig(gtk+-2.0) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FBReader is an e-book reader for various platforms. @@ -80,7 +87,7 @@ Summary: Cross-platform GUI library Group: Development/Libraries/C and C++ -Requires: zlibrary-ui = %{version}-%{release} +Requires: zlibrary-ui = %{version} %description -n zlibrary ZLibrary is a cross-platform library to build applications running on @@ -90,7 +97,7 @@ Summary: Development files for zlibrary Group: Development/Libraries/C and C++ -Requires: zlibrary = %{version}-%{release} +Requires: zlibrary = %{version} %description -n zlibrary-devel This package contains the libraries amd header files that are needed @@ -100,7 +107,7 @@ Summary: GTK+ interface module for ZLibrary Group: Development/Libraries/C and C++ -Provides: zlibrary-ui = %{version}-%{release} +Provides: zlibrary-ui = %{version} %description -n zlibrary-ui-gtk This package provides a GTK+-based UI for ZLibrary. @@ -109,7 +116,7 @@ Summary: Qt4 interface module for ZLibrary Group: Development/Libraries/C and C++ -Provides: zlibrary-ui = %{version}-%{release} +Provides: zlibrary-ui = %{version} %description -n zlibrary-ui-qt This package provides a Qt4-based UI for ZLibrary. @@ -128,49 +135,54 @@ make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy %install -make -C zlibrary/core do_install do_install_dev DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy -make -C zlibrary/text do_install do_install_dev 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 -make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=qt4 -make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop UI_TYPE=dummy +make -C zlibrary/core do_install do_install_dev DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy +make -C zlibrary/text do_install do_install_dev DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy +make -C zlibrary/ui do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=gtk +make -C zlibrary/ui do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=qt4 +make -C fbreader do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop UI_TYPE=dummy +touch %{buildroot}%{_libdir}/zlibrary/ui/zlui-active.so # desktop file -%{__mkdir_p} %{buildroot}%{_datadir}/applications/ +mkdir -p %{buildroot}%{_datadir}/applications/ install -m644 %{SOURCE1} %{buildroot}%{_datadir}/applications/FBReader.desktop %suse_update_desktop_file -i -n FBReader Office Viewer Literature # mime type -%{__mkdir_p} %{buildroot}%{_datadir}/mime/packages/ +mkdir -p %{buildroot}%{_datadir}/mime/packages/ install -m644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/fbreader.xml # man page -%{__mkdir_p} %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man1 install -m644 fbreader/desktop/FBReader.1 %{buildroot}%{_mandir}/man1 -%fdupes -s ${RPM_BUILD_ROOT} +%fdupes -s %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post +%if 0%{?suse_version} > 1130 %desktop_database_post +%endif %postun +%if 0%{?suse_version} > 1130 %desktop_database_postun +%endif %post -n zlibrary -p /sbin/ldconfig %postun -n zlibrary -p /sbin/ldconfig %post -n zlibrary-ui-gtk -/usr/sbin/update-alternatives --install \ +%{_sbindir}/update-alternatives --install \ %{_libdir}/zlibrary/ui/zlui-active.so \ zlibrary-ui \ %{_libdir}/zlibrary/ui/zlui-gtk.so \ 2 %post -n zlibrary-ui-qt -/usr/sbin/update-alternatives --install \ +%{_sbindir}/update-alternatives --install \ %{_libdir}/zlibrary/ui/zlui-active.so \ zlibrary-ui \ %{_libdir}/zlibrary/ui/zlui-qt4.so \ @@ -178,14 +190,14 @@ %preun -n zlibrary-ui-gtk if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove \ + %{_sbindir}/update-alternatives --remove \ zlibrary-ui \ %{_libdir}/zlibrary/ui/zlui-gtk.so fi %preun -n zlibrary-ui-qt if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove \ + %{_sbindir}/update-alternatives --remove \ zlibrary-ui \ %{_libdir}/zlibrary/ui/zlui-qt4.so fi @@ -217,11 +229,17 @@ %files -n zlibrary-ui-gtk %defattr(-,root,root,-) +%dir %{_libdir}/zlibrary +%dir %{_libdir}/zlibrary/ui +%ghost %{_libdir}/zlibrary/ui/zlui-active.so %{_libdir}/zlibrary/ui/zlui-gtk.so %{_datadir}/zlibrary/keynames-gtk.xml %files -n zlibrary-ui-qt %defattr(-,root,root,-) +%dir %{_libdir}/zlibrary +%dir %{_libdir}/zlibrary/ui +%ghost %{_libdir}/zlibrary/ui/zlui-active.so %{_libdir}/zlibrary/ui/zlui-qt4.so %{_datadir}/zlibrary/keynames-qt4.xml ++++++ FBReader.desktop ++++++ --- /var/tmp/diff_new_pack.meFqMc/_old 2011-09-01 16:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.meFqMc/_new 2011-09-01 16:03:23.000000000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=FBReader GenericName=E-book reader GenericName[ru]=Чтение электронных книг @@ -10,6 +9,6 @@ StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png +Icon=FBReader Categories=Office;Viewer;Literature; MimeType=application/x-fictionbook+xml; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
