update: libmal, google-gadgets, pilot-link

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

g/google-gadgets/google-gadgets-vl.spec

@@ -2,27 +2,30 @@
 #define alphatag 20090430svn%{svnrev}
 
 Name:           google-gadgets
-Version:        0.11.1
+Summary:        Google Gadgets platform for Linux
+Version:        0.11.2
 Release:        1%{?_dist_release}
-Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
 License:        ASL 2.0
 URL:            http://code.google.com/p/google-gadgets-for-linux/
+
 Source0:        http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2
 #Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
-# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
-# patch taken from svn r1239
-Patch0:         %{name}-0.11.1-gecko_ver.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  curl-devel libxml2-devel zlib-devel libtool-ltdl-devel
 # still needed even if we're not buliding gtkmoz element, for JavaScript
+%if %{?_dist_release} == "vl5"
 BuildRequires:  xulrunner-devel-unstable
+%else
+BuildRequires:  xulrunner-devel
+%endif
+BuildRequires:  WebKit-gtk-devel 
 BuildRequires:  dbus-devel gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires:  cairo-devel gtk2-devel librsvg2-devel
 BuildRequires:  qt4-devel zip
-#BuildRequires: WebKit-qt-devel
 # Desktop integration
 BuildRequires:  NetworkManager-devel startup-notification-devel
 # libxml2-devel needed for desktop file generation
@@ -40,6 +43,7 @@ the Universal Gadgets on iGoogle.
 
 %package        gtk
 Summary:        GTK+ front-end for %{name}
+Summary(ja):    Google Gadgets の GTK+ 版フロントエンド
 Group:          User Interface/Desktops
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-frontend = %{version}-%{release}
@@ -50,6 +54,7 @@ The %{name}-gtk package contains the GTK+ front-end for %{name}.
 
 %package        qt
 Summary:        Qt front-end for %{name}
+Summary(ja):    Google Gadgets の Qt 版フロントエンド
 Group:          User Interface/Desktops
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-frontend = %{version}-%{release}
@@ -60,6 +65,7 @@ The %{name}-qt package contains the Qt front-end for %{name}.
 
 %package        devel
 Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig dbus-devel gtk2-devel qt4-devel
@@ -73,9 +79,13 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
-%patch0 -p1 -b .gecko_ver
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
+# Fix invalid desktop file MIME type
+# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=360
+for f in hosts/*/ggl-*.desktop.in; do
+    sed -i 's|;app/gg;|;|' $f
+done
 
 
 %build
@@ -128,17 +138,17 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %post gtk
 /sbin/ldconfig
 update-desktop-database &> /dev/null || :
@@ -196,6 +206,13 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Sep 30 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.11.2-1
+- new upstream release
+- built with rpm-4.8.1 for pkg-config
+- dropt Patch0
+- added BR: WebKit-gtk-devel
+- removed invalid MIME entry from .desktop files
+
 * Sat Oct 24 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.11.1-1
 - new upstream release
 

lib/libm/libmal/libmal-vl.spec

@@ -3,14 +3,16 @@
 Summary: MAL (Mobil Application Link) library
 Name: libmal
 Version: %{version}
-Release: 1%{?_dist_release}
-License: MPL
+Release: 2%{?_dist_release}
+
 Group: System Environment/Libraries
-Source: http://http://www.jlogday.com/code/libmal/libmal-%{version}.tar.gz
+License: MPL
 URL: http://www.jlogday.com/code/libmal/
 
+Source: http://http://www.jlogday.com/code/libmal/libmal-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pilot-link
+BuildRequires: pilot-link-devel
 
 %description
 libmal is really just a convenience library of the functions in Tom Whittaker's
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 30 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.44.1-2
+- added BR: pilot-link-devel
+
 * Thu Apr 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.44.1-1
 - new upstream release
 - built with new toolchain

p/pilot-link/pilot-link-vl.spec

@@ -1,26 +1,27 @@
-%define	ver	0.12.4
+%define	ver	0.12.5
 %define	srcver	%{ver}
 %define	rel	1%{?_dist_release}
 %define support_perl 0
 
+Name:		pilot-link
 Summary:	File transfer utilities between Linux and PalmPilots.
 Summary(ja):	Linux と Palm handheld device を接続する為のユーティリティ
-Name:		pilot-link
 Version:	%{ver}
 Release:	%{rel}
 Epoch:		1
-Source:		http://downloads.pilot-link.org/pilot-link-%{srcver}.tar.bz2
+
+Group:		Applications/Other
+License:	GPL/LGPL
+URL:            http://www.pilot-link.org/
+
+Source0:		http://downloads.pilot-link.org/pilot-link-%{version}.tar.bz2
 Source1:	connect-palm-ppp.tar.bz2
 Source2:	60-libpisock.rules.vine
+
 # (fc) 0.10.99 fix python/perl installation
 Patch1:		pilot-link-0.11.0-perlmd5.patch
 Patch2:		pilot-link-0.11.0-perlpollute.patch
 Patch3:		pilot-link-0.11.2-malsync.patch
-Patch4:		pilot-link-0.11.5-broken.patch
-#Patch7:	pilot-link-0.11.3-destdir.patch.bz2
-#Patch9:	pilot-link-0.11.8-configure.patch
-License:	GPL/LGPL
-Group:		Applications/Other
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison >= 1.35
@@ -31,12 +32,10 @@ BuildRequires:	popt-devel
 %if %{support_perl}
 BuildRequires:	perl
 %endif
-Requires:	libusb >= 0.1
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
-
 %description
 This suite of tools allows you to upload and download programs and
 data files between a Linux/UNIX machine and the PalmPilot.  It has a
@@ -59,12 +58,21 @@ Perl bindingsを使用する場合は、pilot-link の source を調べる必要
 Palm handheld device を Vine Linux システムで同期させたい場合は
 pilot-link をインストールします。
 
+%package libs
+Summary:	Runtime libraries for %{name}
+Summary(ja): 	%{name} のランタイムライブラリ
+Group:		System Environment/Libraries
+Requires:	libusb >= 0.1
+
+%description libs
+This package provides the shared libraries for any pilot-link client 
+program or interface.
+
 %package devel
 Summary:	PalmPilot development header files.
 Summary(ja): 	Palm handheld プログラム開発用のヘッダ ファイル
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	pkgconfig
+Requires:	%{name}-libs = %{epoch}:%{version}
 
 %description devel
 This package contains the development headers that are used to build
@@ -90,16 +98,6 @@ pilot-link-devel パッケージをインストールする必要があります
 %patch3 -p1 -b .malsync
 %endif
 
-#%patch7 -p1 -b .destdir
-#patch9 -p1 -b .mathlib
-
-#needed by patch 7 & 8
-#aclocal
-#automake
-
-#update libtool (needed for linking libpisock++ correctly)
-#libtoolize --force
-
 %build
 %configure\
   --disable-static \
@@ -147,9 +145,9 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libpisock
 # remove files we don't want to include
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %clean
@@ -157,28 +155,38 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %files
 %defattr(-,root,root)
-%doc COPYING COPYING.LIB ChangeLog README NEWS AUTHORS doc/README.*
+%doc COPYING ChangeLog README NEWS AUTHORS doc/README.*
+%{_bindir}/*
+%{_mandir}/man1/*
+
+%files libs
+%defattr(-,root,root)
+%doc COPYING.LIB 
 %{_sysconfdir}/udev/rules.d/60-libpisock.rules
 %{_libdir}/*.so.*
-%{_datadir}/pilot-link
 %if %{support_perl}
 %{_libdir}/perl5/vendor_perl/*/*/*/PDA
 %{_libdir}/perl5/vendor_perl/*/*/PDA
 %endif
-%{_bindir}/*
-%{_mandir}/man*/*
+%{_datadir}/pilot-link
+%{_mandir}/man7/*
 
 %files devel
 %defattr(-, root, root)
-#{_libdir}/*.a
 %{_libdir}/*.so
-#%{_libdir}/*.la
+#{_libdir}/*.la
 %{_libdir}/pkgconfig/pilot-link.pc
 %{_includedir}/*
 %{_datadir}/aclocal/*.m4
 
 
 %changelog
+* Thu Sep 30 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.5-1
+- new upstream release
+- split libraries to subpackage
+- built with rpm-4.8.1 for pkg-config
+- added URL tag
+
 * Wed Aug 26 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.4-1
 - new upstream release
 - removed static libraries from devel package