change spec file

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@912 ec354946-7b23-47d6-9f5a-488ba84defc7

e/epiphany-extensions/epiphany-extensions-vl.spec

@@ -1,12 +1,12 @@
-%global ephy_major          2.28
-%global ephy_min_version    %{ephy_major}.1
+%global ephy_major          2.30
+%global ephy_min_version    %{ephy_major}.0
 %global gecko_version       1.9.1
 
 Summary:        Extensions for Epiphany, the GNOME web browser
 Summary(ja):    Epiphany (GNOMEウェブブラウザ) 用の拡張
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.1
+Version:        %{ephy_min_version}
 Release:        1%{?_dist_release}
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -27,6 +27,8 @@ BuildRequires:	libtool
 BuildRequires:	opensp-devel
 BuildRequires:	pcre-devel
 BuildRequires:	WebKit-gtk-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	gnome-doc-utils >= 0.3.2
 
 Requires:       epiphany
 Requires:       pygtk2
@@ -54,7 +56,8 @@ GNOME web browser.
 %{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool install
 
-%{find_lang} %{name}-%{ephy_major}
+## %{find_lang} %{name}-%{ephy_major}
+%{find_lang} %{name}-2.29
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -66,7 +69,8 @@ scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 %postun
 scrollkeeper-update -q ||:
 
-%files -f %{name}-%{ephy_major}.lang
+## %files -f %{name}-%{ephy_major}.lang
+%files -f %{name}-2.29.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.README ChangeLog README NEWS
 %{_datadir}/epiphany/icons/hicolor/*/status/feed-presence.*
@@ -81,6 +85,11 @@ scrollkeeper-update -q ||:
 #{_sysconfdir}/gconf/schemas/epilicious.schemas
 
 %changelog
+* Wed Apr 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
+- new upstream release
+- add BuildRequires: GConf2-devel, gnome-doc-utils >= 0.3.2
+- fix find_lang from %{name}-%{ephy_major} to %{name}-2.29
+
 * Sun Nov 29 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.28.1-1
 - new upstream release
 - BR: WebKit-gtk-devel instead of gecko-devel

e/evolution/evolution-vl.spec

@@ -1,46 +1,46 @@
-%define dbus_glib_version 0.70
-%define dbus_version 0.90
-%define eds_version 2.28.1
+%define dbus_glib_version 0.86
+%define dbus_version 1.2.24
+%define eds_version 2.30.0
 %define gnome_doc_utils_version 0.8.0
-%define gnome_icon_theme_version 2.28.0
+%define gnome_icon_theme_version 2.30.0
 %define gnome_pilot_version 2.0.13
 %define libxml2_version 2.7.6
-%define gtkhtml_version 3.24.0
+%define gtkhtml_version 3.30.0
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
-%define libbonoboui_version 2.24.0
 %define orbit2_version 2.14.0
 %define pilot_link_version 2:0.12.1
 %define scrollkeeper_version 0.1.4
-%define soup_version 2.2.2
+%define soup_version 2.30.0
+%define unique_version 1.1.6
+%define gstreamer_version 0.10.28
+%define gnome_desktop_version 2.30.0
 
-%define evo_major 2.28
+%define evo_major 2.30
 
-%define exchange_support 1
 %define inline_audio_support 0
 %define ldap_support 1
 %define libnotify_support 1
 %define krb5_support 1
-%define nntp_support 1
 
 %define nm_support 1
 %define build_conduits 0
 %define use_mozilla_nss 1
 
 # Use stricter build settings than required by upstream.
-%define strict_build_settings 1
+%define strict_build_settings 0
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.1
+Version: 2.30.0.1
 Release: 1%{?_dist_release}
 License: GPLv2 and GFDL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/projects/evolution/
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.26/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.30/%{name}-%{version}.tar.bz2
 
 Summary: GNOME's next-generation groupware suite
 Summary(ja): GNOME 次世代グループウェアスイート
@@ -71,8 +71,7 @@ Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-vfs2 >= %{gnomevfs2_version}
 Requires: gnutls
-Requires: gtk2 >= 2.4.0
-Requires: libbonoboui >= %{libbonoboui_version}
+Requires: gtk2 >= 2.20.0
 Requires: libsoup >= %{soup_version}
 
 %if %{libnotify_support}
@@ -90,12 +89,12 @@ BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
 BuildRequires: bison
-BuildRequires: byacc
+## BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
 BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: flex
+## BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
@@ -103,14 +102,20 @@ BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libbonobo-devel >= 2.0
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: pkgconfig
+BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: libcanberra-devel
+BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
+BuildRequires: gstreamer-devel >= %{gstreamer_version}
+BuildRequires: gtkimageview-devel
+BuildRequires: libSM-devel
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: rarian-compat
 
 %if %{use_mozilla_nss}
 BuildRequires: nspr-devel
@@ -147,6 +152,7 @@ BuildRequires: NetworkManager-glib-devel
 BuildRequires: libnotify-devel
 %endif
 
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The tools which make up Evolution will
@@ -259,12 +265,6 @@ done
 %define krb5_flags --without-krb5
 %endif
 
-%if %{nntp_support}
-%define nntp_flags --enable-nntp=yes
-%else
-%define nntp_flags --enable-nntp=no
-%endif
-
 %if %{use_mozilla_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
 %else
@@ -278,12 +278,6 @@ if ! pkg-config --exists nss; then
 fi
 %endif
 
-%if %{exchange_support}
-%define exchange_flags --enable-exchange=yes
-%else
-%define exchange_flags --enable-exchange=no
-%endif
-
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
 %if ! %{use_mozilla_nss}
@@ -310,14 +304,18 @@ CFLAGS="$CFLAGS \
 	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 # TODO: Make -DCAMEL_DISABLE_DEPRECATED work.
+
+%else
+CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
 %endif
 
 %configure \
   --enable-gtk-doc \
-  --enable-ipv6 \
   --with-sub-version=" (%{version}-%{release})" \
   --with-kde-applnk-path=no \
-  %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
+  %ldap_flags %pilot_flags %krb5_flags %ssl_flags \
+  --disable-pst-import \
   --enable-plugins=all
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing"
@@ -353,10 +351,6 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
-done
-
 # evolution link
 #ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
 
@@ -400,51 +394,70 @@ rm -rf $RPM_BUILD_ROOT
 %files -f translations.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+
 # GConf schemas:
 %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
-%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
-%{_bindir}/*
-%{_datadir}/applications/*
-%{_datadir}/gnome/help/evolution
-%{_datadir}/idl/evolution-%{evo_major}
-#{_datadir}/mime-info/*
+# The main executable
+%{_bindir}/evolution
+
+# The alarm notify daemon
+%{_bindir}/evolution-alarm-notify
+
+%{_bindir}/evolution-settings
+
+# Desktop files:
+%{_datadir}/applications/evolution.desktop
+%{_datadir}/applications/evolution-settings.desktop
+%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
+
+# Icons:
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
+
+# The main data directory
+# (have not attempted to split this up into an explicit list)
 %dir %{_datadir}/evolution
 %{_datadir}/evolution/%{evo_major}
-%{_datadir}/omf/evolution
-%{_datadir}/icons/*
-%{_libdir}/bonobo/servers/*
+
+# Modules:
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_major}
-%dir %{_libdir}/evolution/%{evo_major}/components
-%{_libdir}/evolution/%{evo_major}/*.so.*
-%{_libdir}/evolution/%{evo_major}/components/*.so
+%{_libdir}/evolution/%{evo_major}/modules
+
+# Shared libraries:
+%{_libdir}/evolution/%{evo_major}/lib*.so.*
+
+# Various libexec programs:
 %dir %{_libexecdir}/evolution
-%{_libexecdir}/evolution/%{evo_major}
+%dir %{_libexecdir}/evolution/%{evo_major}
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
+%{_libexecdir}/evolution/%{evo_major}/evolution-backup
+%{_libexecdir}/evolution/%{evo_major}/killev
 
 # The plugin directory:
 %dir %{evo_plugin_dir}
-#{_libdir}/evolution/%{evo_major}/plugins/*
 
 # The various plugins follow; they are all part of the main package:
-# (note that there are various resources such as glade and pixmap files that 
+# (note that there are various resources such as ui and pixmap files that 
 # are built as part of specific plugins but which are currently packaged using 
 # globs above; the purpose of the separation below is to be more explicit about
 # which plugins we ship)
-%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug
-%{evo_plugin_dir}/libmail-account-disable.so
-
 %{evo_plugin_dir}/org-gnome-addressbook-file.eplug
 %{evo_plugin_dir}/liborg-gnome-addressbook-file.so
 
-%{evo_plugin_dir}/attachment-reminder.glade
 %{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
 
@@ -454,9 +467,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %{evo_plugin_dir}/org-gnome-backup-restore.eplug
-%{evo_plugin_dir}/org-gnome-backup-restore.xml
 %{evo_plugin_dir}/liborg-gnome-backup-restore.so
 
+%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
+
 %{evo_plugin_dir}/org-gnome-calendar-file.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-file.so
 
@@ -466,15 +481,15 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-calendar-weather.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-weather.so
 
-%{evo_plugin_dir}/org-gnome-copy-tool.eplug
-%{evo_plugin_dir}/liborg-gnome-copy-tool.so
-
 %{evo_plugin_dir}/org-gnome-default-mailer.eplug
 %{evo_plugin_dir}/liborg-gnome-default-mailer.so
 
 %{evo_plugin_dir}/org-gnome-default-source.eplug
 %{evo_plugin_dir}/liborg-gnome-default-source.so
 
+%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
+%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
+
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
 
@@ -484,23 +499,12 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
-%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
-%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
-%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
-%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
-%{evo_plugin_dir}/org-gnome-folder-permissions.xml
-%{evo_plugin_dir}/org-gnome-folder-subscription.xml
-
-#{evo_plugin_dir}/org-gnome-face.eplug
-#{evo_plugin_dir}/liborg-gnome-face.so
-
 %{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 %{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 %{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
-%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
-%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
+%{evo_plugin_dir}/org-gnome-image-inline.eplug
+%{evo_plugin_dir}/liborg-gnome-image-inline.so
 
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so
@@ -510,64 +514,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
 %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
-%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml
 
 %{evo_plugin_dir}/org-gnome-mail-notification.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-notification.so
 
 %{evo_plugin_dir}/org-gnome-mail-to-task.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-to-task.so
-%{evo_plugin_dir}/org-gnome-mail-to-task.xml
 
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
 
 %{evo_plugin_dir}/org-gnome-plugin-manager.eplug
 %{evo_plugin_dir}/liborg-gnome-plugin-manager.so
-%{evo_plugin_dir}/org-gnome-plugin-manager.xml
 
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
+%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
+
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
-%{evo_plugin_dir}/org-gnome-select-one-source.eplug
-%{evo_plugin_dir}/liborg-gnome-select-one-source.so
-
 %{evo_plugin_dir}/org-gnome-subject-thread.eplug
 %{evo_plugin_dir}/liborg-gnome-subject-thread.so
 
-%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
-%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
-%{evo_plugin_dir}/org-gnome-publish-calendar.xml
-
-%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
-
-#{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug
-#{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so
-
-%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
-%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
-
-%{evo_plugin_dir}/org-gnome-evolution-webdav.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-webdav.so
-
-%{evo_plugin_dir}/templates.glade
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
 
 %{evo_plugin_dir}/org-gnome-vcard-inline.eplug
 %{evo_plugin_dir}/liborg-gnome-vcard-inline.so
-		     
+
+%{evo_plugin_dir}/org-gnome-evolution-webdav.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-webdav.so
+
 %files devel
 %defattr(-, root, root)
 %{_includedir}/evolution-%{evo_major}
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/evolution/%{evo_major}/*.so
-#%{_libdir}/evolution/%{evo_major}/*.a
-#%{_libdir}/evolution/%{evo_major}/*/*.a
 
 %files help -f help.lang
 %defattr(-, root, root)
@@ -600,6 +585,15 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Sun Apr 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0.1-1
+- new upstream release
+- add BuildRequires: unique-devel, gstreamer-devel, gtkimageview-devel, libSM-devel, gnome-desktop-devel, rarian-compat
+- remove BuildRequires: byacc, flex, libbonobo-devel, libbonoboui-devel
+- remove Requires: libbonoboui
+- add configure option (--disable-pst-import)
+- remove unrecognized configure options (--enable-ipv6, --enable-nntp, --enable-exchange)
+- change strict_build_settings (from 1 to 0)
+
 * Sun Nov 01 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.28.1-1
 - new upstream release
 

g/gnome-user-share/gnome-user-share-vl.spec

@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Summary(ja): Gnome ユーザファイル共有
 Name: gnome-user-share
-Version: 2.28.2
+Version: 2.30.0
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Libraries
@@ -20,8 +20,9 @@ BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 BuildRequires: libnotify-devel
 BuildRequires: libcanberra-devel
-BuildRequires: gnome-bluetooth-devel >= 2.28.0
+BuildRequires: gnome-bluetooth-devel >= 2.30.0
 BuildRequires: unique-devel
+BuildRequires: nautilus-devel
 BuildRequires: gnome-doc-utils
 Requires(post,pre,preun): GConf2
 
@@ -44,6 +45,8 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %__make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -75,6 +78,7 @@ fi
 %doc README ChangeLog
 %{_bindir}/*
 %{_libexecdir}/*
+%{_libdir}/nautilus/extensions-2.0/*.so
 %{_datadir}/gnome-user-share
 %{_datadir}/applications/*
 %{_datadir}/gnome/*
@@ -84,8 +88,12 @@ fi
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 
 %changelog
+* Thu Apr 22 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
+- new upstream release
+- add BuildRequires: nautilus-devel
+
 * Thu Jan 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.2-1
-- initial build for Vine Linux
+- new upstream release
 - add BuildRequires: libnotify-devel, libcanberra-devel, gnome-bluetooth-devel, unique-devel, gnome-doc-utils
 - add Requires: gnome-bluetooth-libs
 

lib/libg/libgnomeprint/libgnomeprint-vl.spec

@@ -15,7 +15,7 @@
 Summary: Printing library for GNOME.
 Summary(ja): GNOME プリントライブラリ
 Name:		libgnomeprint
-Version: 	2.18.6
+Version: 	2.18.7
 Release:	1%{?_dist_release}
 License:	LGPL
 Group:          System Environment/Libraries
@@ -30,13 +30,15 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: freetype2 >= %{freetype_version}
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: libgnomecups-devel >= 0.2.0
+BuildRequires: bison
+BuildRequires: flex
 
 Requires: libgnomecups >= 0.1.13-0vl2
-PreReq:	urw-fonts
-PreReq:	ghostscript
-PreReq:	ghostscript-fonts
-PreReq:	libxml
-PreReq: perl
+Requires: urw-fonts
+Requires: ghostscript
+Requires: ghostscript-fonts
+Requires: libxml
+Requires: perl
 
 
 %description
@@ -55,7 +57,7 @@ Summary: Libraries and include files for developing GNOME applications.
 Summary(ja): libgnomeprint のライブラリとヘッダファイル
 Group: Development/Libraries
 
-Requires: %{name} = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_version}
 Requires: pango-devel >= %{pango_version}
 Requires: libxml2-devel >= %{libxml2_version}
@@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Apr 22 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18.7-1
+- new upstream release
+- add BuildRequires: bison, flex
+
 * Wed Mar 11 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.18.6-1
 - new upstream release
 

lib/libg/libgnomeprintui/libgnomeprintui-vl.spec

@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Summary(ja): libgnomeprint の GUI サポート
 Name: libgnomeprintui
-Version: 2.18.4
+Version: 2.18.5
 Release: 1%{?_dist_release}
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Apr 22 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18.5-1
+- new upstream release
+
 * Wed Mar 11 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.18.4-1
 - new upstream release
 

s/sound-juicer/sound-juicer-vl.spec

@@ -1,7 +1,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Summary(ja):	シンプルで簡単なCDリッピングツール
-Version:	2.28.1
+Version:	2.28.2
 Release:	1%{?_dist_release}
 License:	GPL
 Group:		Applications/Multimedia
@@ -102,6 +102,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.2-1
+- new upstream release
+
 * Sat Jan 16 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.1-1
 - new upstream release
 - remove configure option: --enable-hal (unrecognized option)

s/swfdec/swfdec-vl.spec

@@ -1,291 +1,158 @@
-%define	major_version	0.9
-%define liboil_version	0.3.1
-%define	gtk2_version	2.16.0
-%define pango_version	1.24
+Summary:        Programs to integrate Flash into the GNOME desktop
+Summary(ja):    Flash を GNOME デスクトップに統合するためのプログラム
 
-Summary:	Flash animation rendering library
-Summary(ja):	Flash アニメーションレンダリングライブラリ
-
-Name:		swfdec
-Version:	%{major_version}.2
+Name:           swfdec-gnome
+Version:        2.30.0
 Release:        1%{?_dist_release}
 
-Group:		System Environment/Libraries
-License:	LGPLv2+
-URL:		http://swfdec.freedesktop.org/
-Source0:	http://swfdec.freedesktop.org/download/%{name}/%{major_version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://swfdec.freedesktop.org/
+Source0:        http://swfdec.freedesktop.org/download/%{name}/2.26/%{name}-%{version}.tar.bz2
+Patch1:		swfdec-gnome-2.26.0-swfdec-0.9.patch
 
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel >= 2.16
-BuildRequires:	gstreamer-devel >= 0.10.11
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.15
-BuildRequires:	gtk2-devel >= %{gtk2_version}
-BuildRequires:	liboil-devel >= %{liboil_version}
-BuildRequires:	libsoup-devel >= 2.4.0
-BuildRequires:	pango-devel >= %{pango_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires(pre):	/sbin/ldconfig
-Requires(post):	/sbin/ldconfig
+BuildRequires:  gtk2-devel >= 2.14.0
+BuildRequires:	swfdec-gtk-devel >= 0.9.2
+BuildRequires:	GConf2
+BuildRequires:  desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	perl(XML::Parser)
 
+Requires(pre): GConf2
+Requires(post):	GConf2
+Requires(preun): GConf2
 
 %description
-swfdec is a library for rendering Adobe Flash animations. Currently it handles
-most Flash 3, 4 and many Flash 7 videos. 
-
-
-%package	devel
-Summary:	Development files for %{name}
-Summary(ja):	%{name} の開発ファイル
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	liboil-devel
-Requires:	pango-devel
-Requires:	pkgconfig
-
-
-%description	devel
-%{name}-devel contains the files needed to build packages that depend on
-swfdec.
-
-
-%package	gtk
-Summary:	A library for easy embedding of Flash files in an application
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires(pre):	/sbin/ldconfig
-Requires(post):	/sbin/ldconfig
-
-
-%description	gtk
-%{name}-gtk is a library for developers that allows one to easily embed
-Flash videos and animations into their appplications. 
-
-
-%package	gtk-devel
-Summary:	Development files for swfdec-gtk
-Summary(ja):	swfdec-gtk の開発ファイル
-Group:		Development/Libraries
-Requires:	%{name}-gtk = %{version}-%{release}
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	gtk2-devel
-
-
-%description	gtk-devel
-%{name}-gtk is a library for developers that allows one to easily embed
-Flash videos and animations into their appplications. This package contains
-files necessary to build packages and appplications that use %{name}-gtk.
+This package contains programs to integrate Flash functionality into the GNOME
+desktop.  It's main application is swfdec-player, a stand-alone viewer for 
+Flash files.  It also contains swfdec-thumbnailer, a program that provides 
+screenshots for files to display in the Nautilus file manager
 
 
 %prep
 %setup -q
+%patch1 -p1
 
-		
 %build
-%configure --disable-static --with-audio=alsa
-
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
+%configure
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
+%find_lang %{name}
 
-%check
-# Disabling test since it will fail due to the gstreamer mp3 plugin
-# not being available in Fedora.
-#
-#export LD_LIBRARY_PATH=`pwd`/libswfdec/.libs:`pwd`/libswfdec-gtk/.libs
-#make check
-#unset LD_LIBRARY_PATH
+desktop-file-install --vendor "fedora" --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  $RPM_BUILD_ROOT%{_datadir}/applications/swfdec-player.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-
-%post gtk -p /sbin/ldconfig
-
-
-%postun	-p /sbin/ldconfig
-
-
-%postun gtk -p /sbin/ldconfig
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/swfdec-thumbnailer.schemas >/dev/null || :
+fi
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README 
-%{_libdir}/libswfdec-%{major_version}.so.*
+%post
+update-desktop-database &> /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/swfdec-thumbnailer.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
-%files	devel
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/%{name}/
-%{_libdir}/pkgconfig/%{name}-%{major_version}.pc
-%{_libdir}/libswfdec-%{major_version}.so
-%dir %{_includedir}/%{name}-%{major_version}
-%{_includedir}/%{name}-%{major_version}/swfdec/
+%postun
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
-%files	gtk
-%defattr(-,root,root,-)
-#%{_datadir}/icons/hicolor/*/apps/%{name}.png
-#%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_libdir}/libswfdec-gtk-%{major_version}.so.*
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/swfdec-thumbnailer.schemas > /dev/null || :
+fi
 
 
-%files	gtk-devel
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_libdir}/libswfdec-gtk-%{major_version}.so
-%{_libdir}/pkgconfig/%{name}-gtk-%{major_version}.pc
-%{_includedir}/%{name}-%{major_version}/swfdec-gtk/
-
+%doc COPYING AUTHORS NEWS README
+%{_bindir}/swfdec-player
+%{_bindir}/swfdec-thumbnailer
+%{_sysconfdir}/gconf/schemas/swfdec-thumbnailer.schemas
+%{_datadir}/applications/fedora-swfdec-player.desktop
+%{_datadir}/%{name}/
+%{_mandir}/man1/swfdec*.1.gz
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
-* Mon Mar 23 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.2-1
+* Wed Apr 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
 - new upstream release
 
-* Wed Dec 31 2008 Shu KONNO <owa@bg.wakwak.com> 0.8.4-1
+* Mon Mar 23 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.26.0-1
 - new upstream release
+- add patch1 to build with swfdec-0.9
 
-* Sat Sep 27 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 	0.8.0-1
+* Sat Sep 27 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 2.24.0-1
 - initial build for Vine Linux
 
-* Mon Sep  8 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.8.0-1
-- Update to 0.8.0.
-
-* Wed Jul 30 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.7.4-1
-- Update to 0.7.4.
-
-* Wed Jun 25 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.7.2-1
-- Update to 0.7.2
+* Mon Sep  8 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.23.4-1
+- Update to 2.23.4.
 
-* Wed Apr 23 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.6-1
-- Update to 0.6.6.
-- Drop memory-overwrite patch.  Fixed upstream.
-- Drop alsa patch. Fixed upstream.
+* Wed Jul 30 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.23.2-1
+- Update to 2.23.2.
+- Drop configure patch. Fixed upstream.
 
-* Thu Apr 10 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.4-3
-- Add patch to fix memory overwrite error. (#441614)
+* Wed Jul 09 2008 Nikolay Vladimirov <nikolay@vladimiroff.com> - 2.22.2-1
+- Update to 2.22.2
+- Add patch to build with swfdec-0.7.* 
 
-* Thu Apr 10 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.4-2
-- Build w/ alsa backend instead of pulse audio.
-- Add patch to fix alsa support. (#441617).
-- Drop unnecessary BR on js-devel and gnome-vfs2-devel.
-- Add BR on glib2-devel.
+* Fri Jun 27 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.22.0-2
+- Rebuild for new swfdec.
 
-* Wed Apr  9 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.4-1
-- Update to 0.6.4.
+* Sat Mar 15 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1
+- Update to 2.22.0
 
-* Sat Mar 29 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.2-1
-- Update to 0.6.2.
+* Sun Feb 24 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.21.91-1
+- Update to 2.21.91.
 
-* Wed Feb 20 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.6.0-1
-- Update to 0.6.0.
-- Bump minimum version of gstreamer needed.
-- Add BR for gstreamer-plugins-base-devel.
+* Wed Feb 20 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.21.90-3
+- Rebuild for new swfdec.
 
-* Thu Feb 14 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.5.90-3
-- Rebuild for new libsoup.
-
-* Fri Feb  8 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.5.90-2
+* Fri Feb  8 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.21.90-2
 - Rebuild for gcc-4.3.
 
-* Tue Jan 29 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.5.90-1
-- Update to 0.5.90.
-- Bump BR minimum versions for libsoup & pango.
+* Tue Jan 29 2008 Brian Pepple <bpepple@fedoraproject.org> - 2.21.90-1
+- Update to 2.21.90.
+- Add man pages.
+- Update version of swfdec needed.
 
 * Wed Dec 19 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.5.5-2
-- Build w/ pulse audio support.
+- Rebuild for pulse audio enable swfdec.
 
 * Mon Dec 17 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.5.5-1
 - Update to 0.5.5.
 
-* Fri Nov 16 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.5.4-2
-- Add requires for pango-devel to devel pkg.
-- Keep timestamp on installed files.
+* Tue Nov 20 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.5.4-2
+- Add scriptlet to update desktop-database.
+- Add vendor to desktop file, even though it's not really necessary.
 
 * Thu Nov 15 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.5.4-1
-- Update to 0.5.4.
-- Use valid license tag.
-- Remove BR on ffmpeg & libmad, and only build gstreamer backend.
-
-* Fri Oct 12 2007  Peter Gordon <peter@thecodergeek.com> - 0.5.3-1
-- Update to new upstream release (0.5.3)
-
-* Wed Oct 10 2007  Peter Gordon <peter@thecodergeek.com> - 0.5.2-1
-- Update to new upstream release (0.5.2)
-
-* Wed Aug 15 2007  Peter Gordon <peter@thecodergeek.com> - 0.5.1-1
-- Update to new upstream release (0.5.1)
-
-* Thu Jul  5 2007 kwizart <kwizart at gmail.com> - 0.4.5-1
-- Update to 0.4.5 (bugfix)
-- Add BR ffmpeg-devel libmad-devel (enabled in configure)
-- Remove rpath (libtool method)
-
-* Sat Apr 28 2007 Peter Gordon <peter@thecodergeek.com> - 0.4.4-1
-- Update to new upstream release (0.4.4), which adds two new subpackages:
-  swfdec-gtk and swfdec-gtk-devel.
-
-* Sun Mar 25 2007 Peter Gordon <peter@thecodergeek.com> - 0.4.3-2
-- Add js-devel to the BuildRequires to fix compilation in Mock.
-  (Thanks to  Julian Sikorski; Livna bug #1453) 
-
-* Sat Mar 24 2007 Peter Gordon <peter@thecodergeek.com> - 0.4.3-1
-- Update to new upstream release (0.4.3), with lots of spec cleanups
-- Spec file based heavily on Thomas Vander Stichele's 0.3.6 stuff.
-
-* Sun Dec 03 2006 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.3.6-0.gst.2
-- fix pre/post scripts
-
-* Sun Dec 03 2006 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.3.6-0.gst.1
-- new upstream
-- remove swf_play
-- add js-devel and gimp-devel buildrequires
-- add gimp plugin
-
-* Fri Jun 24 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.3.5-0.gst.1
-- updated to new upstream
-
-* Tue May 17 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.3.4-0.gst.1
-- updated to new upstream
-
-* Thu Mar 03 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.3.2-0.lvn.1
-- updated to new liboil and upstream release
-
-* Thu Nov 11 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- new upstream release
-
-* Thu May 20 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.2.2-0.lvn.2
-- require gcc-c++ for libtool
-- fix pre/post req
-- fix gtk loaders location
-- work around FC2 packaging bug for SDL-devel
-
-* Tue Mar 02 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.2.2-0.lvn.1: updated for rpm.livna.us (without mozilla plugin)
-
-* Mon May 19 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- Updated for 0.2.2
+- Intial Fedora spec.
 
-* Wed Feb 05 2003 Christian F.K. Schaller <Uraeus@linuxrising.org>
-- Update spec to handle pixbuf loader
-* Sat Oct 26 2002 Christian F.K. Schaller <Uraeus@linuxrising.org>
-- First attempt at spec

t/tracker/tracker-vl.spec

@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Summary(ja): オブジェクト/タグ/メタデータデータベースおよび検索ツール
 Name: tracker
-Version: 0.8.0
+Version: 0.8.3
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/System
@@ -20,7 +20,7 @@ BuildRequires: desktop-file-utils, intltool
 BuildRequires: raptor-devel >= 1.4.18
 BuildRequires: sqlite3-devel
 BuildRequires: dbus-devel >= 1.0
-BuildRequires: dbus-glib >= 0.73
+BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libgnome-devel >= 2.13.2
 BuildRequires: libgnomeui-devel >= 2.13.7
 BuildRequires: libSM-devel
@@ -28,6 +28,8 @@ BuildRequires: libnotify-devel >= 0.4.3
 BuildRequires: libuuid-devel
 BuildRequires: vala-devel
 BuildRequires: libgee-devel
+BuildRequires: upower-devel
+BuildRequires: gnome-applets
 ## BuildRequires: autoconf, automake
 
 %description
@@ -73,9 +75,9 @@ GNOME libraries
 ## sed -e '/^#!\//,1 d' -i python/deskbar-handler/*.py
 
 %build
-## libtoolize --force --copy
-## intltoolize --copy --force
-## autoreconf -i -f
+libtoolize --force --copy
+intltoolize --copy --force
+autoreconf -i -f
 %configure --disable-static \
 	   --enable-video-extractor=external \
 	   --enable-tracker-search-tool
@@ -99,6 +101,7 @@ desktop-file-install --delete-original               \
         %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.{a,la}
+rm -rf %{buildroot}%{_datadir}/tracker-tests
 
 %find_lang %{name}
 
@@ -160,6 +163,11 @@ fi
 
 
 %changelog
+* Sun Apr 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.3-1
+- new upstream release
+- add BuildRequires: upower-devel, gnome-applets
+- change BuildRequires: dbus-glib -> dbus-glib-devel
+
 * Sun Mar 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.0-1
 - new upstream release
 - add BuildRequires: libgnome-devel, libgnomeui-devel, libSM-devel, libnotify-devel, libuuid-devel, libgee-devel