Hello community, here is the log from the commit of package chmsee for openSUSE:Factory checked in at Tue Oct 4 18:08:05 CEST 2011.
-------- --- openSUSE:Factory/chmsee/chmsee.changes 2011-09-23 01:53:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/chmsee/chmsee.changes 2011-10-04 09:30:00.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 30 07:43:55 UTC 2011 - w...@rosenauer.org + +- Update to version 1.99.05: + + Transformed into a xulrunner application +- Packaging completely reworked since everything changed, and + there's no easy "make install" any more. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- chmsee-1.3.1.1.tar.bz2 New: ---- Makefile jungleji-chmsee-v1.99.05-0-g7fb12b8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.TiC6uq/_old 2011-10-04 18:08:02.000000000 +0200 +++ /var/tmp/diff_new_pack.TiC6uq/_new 2011-10-04 18:08:02.000000000 +0200 @@ -19,43 +19,24 @@ Name: chmsee -%if %suse_version > 1130 -%define xulrunner_version 20 -%define xulrunner_version2 2.0 -%else -%if %suse_version > 1120 -%define xulrunner_version 192 -%define xulrunner_version2 1.9.2 -%else -%if %suse_version > 1110 -%define xulrunner_version 191 -%define xulrunner_version2 1.9.1 -%else -%define xulrunner_version 190 -%define xulrunner_version2 1.9.0 -%endif -%endif -%endif Summary: A Gtk+2 CHM document viewer -Version: 1.3.1.1 +Version: 1.99.05 Release: 1 License: GPLv2+ Group: Productivity/Graphics/Viewers Url: http://code.google.com/p/chmsee/ -Source: %{name}-%{version}.tar.bz2 +Source0: jungleji-chmsee-v1.99.05-0-g7fb12b8.tar.gz +Source1: Makefile BuildRequires: chmlib-devel -BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: gtk2-devel -BuildRequires: intltool -BuildRequires: libgcrypt-devel -BuildRequires: libglade2-devel -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: xulrunner-devel BuildRequires: shared-mime-info BuildRequires: update-desktop-files +%define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner) +Requires: xulrunner = %{xulrunner_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: mozilla-xulrunner%{xulrunner_version} -Recommends: %{name}-lang %description It uses chmlib to extract files. It uses gecko to display pages. It @@ -65,40 +46,51 @@ actively developed and maintained. The author of chmsee is Jungle Ji and several other great people. -%lang_package %prep -%setup -q +%setup -q -n jungleji-chmsee-370f906 +cp %{SOURCE1} src %build -#rename no nb po/no.* -#sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \ -# mv configure.in.tmp configure.in -#autoreconf --force --installa -CFLAGS="$RPM_OPT_FLAGS -Wall" \ -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_SKIP_RPATH:BOOL=yes -make VERBOSE=1 +pushd src +CFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="$RPM_OPT_FLAGS" \ +make +popd %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1 -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime -%find_lang %{name} %{?no_lang_C} -%if %suse_version <= 1100 -# since xulrunner .pc files don't contain RPATH -install -p -m 755 -D $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name} -cat > $RPM_BUILD_ROOT%{prefix}/bin/%{name} <<EOF +# install xulrunner app +mkdir -p %{buildroot}/%{_libdir}/chmsee +cp -r chrome %{buildroot}/%{_libdir}/chmsee/ +cp -r components %{buildroot}/%{_libdir}/chmsee/ +cp -r defaults %{buildroot}/%{_libdir}/chmsee/ +cp application.ini %{buildroot}/%{_libdir}/chmsee/ +cp chrome.manifest %{buildroot}/%{_libdir}/chmsee/ +cp %{_libdir}/xulrunner-%{xulrunner_version}/xulrunner-stub %{buildroot}%{_libdir}/chmsee/chmsee +ln -s %{_libdir}/xulrunner-%{xulrunner_version} %{buildroot}%{_libdir}/chmsee/xulrunner +mkdir -p %{buildroot}%{_bindir} +# because of bmo#690679 a link is not sufficient currently +#ln -s %{_libdir}/chmsee/chmsee %{buildroot}/%{_bindir}/chmsee +cat << EOF > %{buildroot}%{_bindir}/chmsee #!/bin/sh -LD_LIBRARY_PATH=%{_libdir}/xulrunner-%{xulrunner_version2} exec %{prefix}/%_lib/%{name}/%{name} "\$@" +%{_libdir}/chmsee/chmsee EOF -%endif -%suse_update_desktop_file -r -N Chmsee -G "Compressed HTML Viewer" chmsee GNOME GTK Graphics Office Viewer - -%clean -rm -rf %{buildroot} +chmod 755 %{buildroot}%{_bindir}/chmsee +# Install desktop file +install -d %{buildroot}/%{_datadir}/applications +sed "s:^_::g" data/chmsee.desktop.in > %{buildroot}/%{_datadir}/applications/chmsee.desktop +%suse_update_desktop_file -r chmsee Office Viewer +# Install icons +install -D -m0644 data/chmsee-icon.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/chmsee-icon.png +for size in 16 32 48; do + install -D -m0644 data/icons/hicolor/${size}x${size}/mimetypes/chm.png %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/mimetypes/chm.png +done +install -D -m0644 data/icons/hicolor/scalable/mimetypes/chm.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/mimetypes/chm.svg +# Generate new mime data +install -D -m0644 data/chmsee.mime %{buildroot}/%{_datadir}/mime-info/chmsee.mime +install -D -m0644 data/chmsee.keys %{buildroot}/%{_datadir}/mime-info/chmsee.keys +DESTDIR=%{buildroot} mime-info-to-mime %post -/sbin/ldconfig %if 0%{?suse_version} > 1130 %desktop_database_post %icon_theme_cache_post @@ -108,7 +100,6 @@ %endif %postun -/sbin/ldconfig %if 0%{?suse_version} > 1130 %desktop_database_postun %icon_theme_cache_postun @@ -119,20 +110,15 @@ %files %defattr(-, root, root) -%doc README COPYING AUTHORS ChangeLog NEWS +%doc README COPYING AUTHORS ChangeLog NEWS HACKING %{_bindir}/chmsee -%if %suse_version <= 1100 -%{_libdir}/chmsee -%endif +%{_libdir}/chmsee/ %{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps/chmsee-icon.* %{_datadir}/icons/hicolor/*/mimetypes/chm.* -%{_datadir}/chmsee/ %{_datadir}/mime/packages/chmsee.xml %dir %{_datadir}/mime-info %{_datadir}/mime-info/chmsee.mime %{_datadir}/mime-info/chmsee.keys -%{_datadir}/pixmaps/chmsee-icon.png - -%files lang -f %{name}.lang %changelog ++++++ Makefile ++++++ ## -*- Mode: makefile -*- LIBXUL_SDK = $(shell pkg-config --variable sdkdir libxul) NSPR_INCLUDES = $(shell pkg-config --cflags nspr) NSPR_LIBS = $(shell pkg-config --libs nspr) CHMLIB_INCLUDES = -I/usr/include CHMLIB_LIBS = -lchm include ./common.mk continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
