Browse Source

vpnc: rebuild
libgnomeprint: fix R:libxml2
others: new upstream release

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

Takemikaduchi 11 years ago
parent
commit
e3126ac4f1

+ 5 - 2
N/NetworkManager-openconnect/NetworkManager-openconnect-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.2.0
+%define nm_version          0.9.6.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define openconnect_version 3.02
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Summary(ja): NetworkManager の openconnect 用 VPN 統合
 Name:      NetworkManager-openconnect
-Version:   0.9.2.0
+Version:   0.9.6.2
 Release:   1%{svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -110,6 +110,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.2-1
+- new upstream release
+
 * Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
 - new upstream release
 

+ 8 - 6
N/NetworkManager-openvpn/NetworkManager-openvpn-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.2.0
+%define nm_version          0.9.6.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define openvpn_version     2.1
@@ -9,7 +9,7 @@
 Summary: NetworkManager VPN plugin for OpenVPN
 Summary(ja): OpenVPN を使った NetworkManager 用 VPN プラグイン
 Name: NetworkManager-openvpn
-Version: 0.9.2.0
+Version: 0.9.6.0
 Release: 1%{?svn_snapshot}%{?_dist_release}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -27,9 +27,8 @@ BuildRequires: dbus-devel                 >= %{dbus_version}
 BuildRequires: NetworkManager-devel       >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
-BuildRequires: GConf2-devel
 BuildRequires: libgnomeui-devel
-BuildRequires: gnome-keyring-devel
+BuildRequires: gcr-devel
 BuildRequires: libglade2-devel
 BuildRequires: libpng-devel
 BuildRequires: perl-XML-Parser
@@ -45,8 +44,7 @@ Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: openvpn          >= %{openvpn_version}
 Requires: shared-mime-info >= %{shared_mime_version}
-Requires: GConf2
-Requires: gnome-keyring
+Requires: gcr
 
 
 %description
@@ -115,6 +113,10 @@ fi
 
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.0-1
+- new upstream release
+- change BuildRequires: gcr-devel instead of gnome-keyring-devel
+
 * Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
 - new upstream release
 

+ 5 - 2
N/NetworkManager-pptp/NetworkManager-pptp-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.2.0
+%define nm_version          0.9.6.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define ppp_version         2.4.5
@@ -8,7 +8,7 @@
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
-Version:   0.9.2.0
+Version:   0.9.6.0
 Release:   1%{?svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -111,6 +111,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.0-1
+- new upstream release
+
 * Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
 - new upstream release
 

+ 5 - 2
N/NetworkManager-vpnc/NetworkManager-vpnc-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.2.0
+%define nm_version          0.9.6.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define vpnc_version        0.4
@@ -9,7 +9,7 @@
 Summary:   NetworkManager VPN plugin for vpnc
 Summary(ja): NetworkManager の vpnc 用 VPN プラグイン
 Name:      NetworkManager-vpnc
-Version:   0.9.2.0
+Version:   0.9.6.0
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -98,6 +98,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.0-1
+- new upstream release
+
 * Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
 - new upstream release
 

+ 17 - 25
N/NetworkManager/NetworkManager-vl.spec

@@ -8,7 +8,7 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define applet_version 0.9.4.1
+%define applet_version 0.9.6.2
 
 #define snapshot .git20090414
 #define applet_snapshot %{nil}
@@ -16,7 +16,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 0.9.4.0
+Version: 0.9.6.0
 Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
@@ -26,7 +26,7 @@ Source: %{name}-%{version}%{?snapshot}.tar.xz
 Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.xz
 Source2: nm-system-settings.conf
 
-Patch1:	nm-applet-internal-buildfixes-nm0940.patch
+Patch1:	nm-applet-internal-buildfixes-nm0960.patch
 Patch2:	explain-dns1-dns2.patch
 Patch3:	nm-polkit-permissive.patch
 
@@ -260,37 +260,24 @@ fi
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
-%pre gnome
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-  fi
-fi
-
-%preun gnome
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-  fi
-fi
-
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans gnome
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -341,12 +328,13 @@ fi
 
 %files gnome
 %defattr(-,root,root,0755)
-#%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
-%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
+%{_libexecdir}/nm-applet-migration-tool
 %{_datadir}/applications/*.desktop
 %{_datadir}/nm-applet/
+%{_datadir}/GConf/gsettings/nm-applet.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %{_datadir}/icons/hicolor/16x16/apps/*.png
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/32x32/apps/*.png
@@ -393,6 +381,10 @@ fi
 
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.0-1
+- update to 0.9.6.0
+- update Patch1 (nm-applet-internal-buildfixes-nm0960.patch)
+
 * Sun Apr 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.4.0-1
 - update to 0.9.4.0
 - update Patch1 (nm-applet-internal-buildfixes-nm0940.patch)

+ 4 - 1
W/WebKit/WebKit-vl.spec

@@ -15,7 +15,7 @@
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.8.1
+Version:	1.8.2
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Thu Aug 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.2-1
+- new upstream release
+
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.1-1
 - new upstream release
 - change BuildRequires: gcr-devel instead of gnome-keyring-devel

+ 4 - 1
W/WebKit3/WebKit3-vl.spec

@@ -15,7 +15,7 @@
 %bcond_with	wml
 
 Name:		WebKit3
-Version:	1.8.1
+Version:	1.8.2
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -189,6 +189,9 @@ fi
 
 
 %changelog
+* Thu Aug 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.2-1
+- new upstream release
+
 * Sun Apr 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.1-1
 - new upstream release
 - change BuildRequires: gcr-devel instead of gnome-keyring-devel

+ 4 - 1
a/anjuta/anjuta-vl.spec

@@ -1,4 +1,4 @@
-%define	pkg_version	3.4.3
+%define	pkg_version	3.4.4
 
 %define	glib_required		2.32.0
 %define	gtk_required		3.4.0
@@ -258,6 +258,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
+- new upstream release
+
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 

+ 4 - 1
e/epiphany/epiphany-vl.spec

@@ -10,7 +10,7 @@ ExclusiveArch: %ix86 ppc x86_64 alpha
 Summary: GNOME web browser based on Gecko/WebKit
 Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
 Name: epiphany
-Version: 3.4.2
+Version: 3.4.3
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Internet
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 

+ 4 - 1
e/evolution-data-server/evolution-data-server-vl.spec

@@ -29,7 +29,7 @@
 Summary: Backend data server for evolution
 Summary(ja): Evolution バックエンドデータサーバ
 Name: evolution-data-server
-Version: 3.4.3
+Version: 3.4.4
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
@@ -330,6 +330,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
+- new upstream release
+
 * Thu Jun 21 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 

+ 4 - 1
e/evolution/evolution-vl.spec

@@ -32,7 +32,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.4.3
+Version: 3.4.4
 Release: 1%{?_dist_release}
 License: GPLv2 and GFDL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -612,6 +612,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
+- new upstream release
+
 * Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 - add BuildRequires: gsettings-desktop-schemas-devel

+ 4 - 1
g/gdk-pixbuf2/gdk-pixbuf2-vl.spec

@@ -8,7 +8,7 @@
 %endif
 
 Name:           gdk-pixbuf2
-Version:        2.26.1
+Version:        2.26.2
 Release:        1%{?_dist_release}
 Summary:        An image loading library
 
@@ -203,6 +203,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.2-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.1-1
 - new upstream release
 

+ 4 - 1
g/gparted/gparted-vl.spec

@@ -1,5 +1,5 @@
 %define name	gparted
-%define version	0.13.0
+%define version	0.13.1
 %define release	1%{?_dist_release}
 
 Summary:	Gnome Partition Editor
@@ -101,6 +101,9 @@ fi
 %{_mandir}/man8/gparted.*
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.13.1-1
+- new upstream release
+
 * Sun Jul 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.13.0-1
 - new upstream release
 

+ 4 - 1
g/gtkhtml4/gtkhtml4-vl.spec

@@ -3,7 +3,7 @@
 Summary: gtkhtml version 4 library
 Summary(ja): gtkhtml バージョン4 ライブラリ
 Name: gtkhtml4
-Version: 4.4.3
+Version: 4.4.4
 Release: 1%{?_dist_release}
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.4.4-1
+- new upstream release
+
 * Thu Jun 21 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.4.3-1
 - new upstream release
 

+ 5 - 2
lib/libg/libgee/libgee-vl.spec

@@ -1,6 +1,6 @@
 Name:           libgee
-Version:        0.6.4
-Release:        1%{?_dist_release}
+Version:        0.6.5
+Release:        1%{?dist_release}
 Summary:        GObject collection library
 Summary(ja):    GObject コレクションライブラリ
 
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.6.5-1
+- new upstream release
+
 * Thu Feb 09 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.4-1
 - new upstream release
 

+ 5 - 2
lib/libg/libgnomeprint/libgnomeprint-vl.spec

@@ -16,7 +16,7 @@ Summary: Printing library for GNOME.
 Summary(ja): GNOME プリントライブラリ
 Name:		libgnomeprint
 Version: 	2.18.8
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	LGPL
 Group:          System Environment/Libraries
 Source: 	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
@@ -37,7 +37,7 @@ Requires: libgnomecups >= 0.1.13-0vl2
 Requires: urw-fonts
 Requires: ghostscript
 Requires: ghostscript-fonts
-Requires: libxml
+Requires: libxml2
 Requires: perl
 
 
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18.8-2
+- change Requires: libxml2 instead of libxml
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18.8-1
 - new upstream release
 

+ 5 - 2
m/metacity/metacity-vl.spec

@@ -3,8 +3,8 @@
 Summary: Metacity window manager
 Summary(ja): Metacity ウインドウマネージャ
 Name: metacity
-Version: 2.34.3
-Release: 2%{?_dist_release}
+Version: 2.34.5
+Release: 1%{?_dist_release}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 License: GPL
 Group: User Interface/Desktops
@@ -150,6 +150,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.34.5-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.34.3-2
 - update Source10 (metacity-theme-vine-7.tar.xz)
 

+ 23 - 8
o/openconnect/openconnect-vl.spec

@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	3.02
+Version:	4.06
 Release:        1%{?_dist_release}
 Summary:	Open client for Cisco AnyConnect VPN
 Summary(ja):	Cisco AnyConnect VPM 用のオープンクライアント
@@ -10,8 +10,13 @@ URL:		http://git.infradead.org/users/dwmw2/openconnect.git
 Source0:	ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
+BuildRequires:	openssl-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	dbus-devel
 BuildRequires:	libproxy-devel
+BuildRequires:	p11-kit-devel
+BuildRequires:	vpnc
 Requires:	vpnc
 
 %description
@@ -38,34 +43,44 @@ for NetworkManager etc.
 %setup -q
 
 %build
+%configure --disable-static
 make %{?_smp_mflags} openconnect
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-make install-lib LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m0644 openconnect.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/openconnect
+%{_sbindir}/%{name}
+%{_libdir}/libopenconnect.so.*
+%{_docdir}/%{name}
 %{_mandir}/man8/*
-%doc TODO COPYING.LGPL openconnect.html
+%doc TODO COPYING.LGPL
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libopenconnect.a
+%{_libdir}/libopenconnect.so
 /usr/include/openconnect.h
-%{_libdir}/pkgconfig/openconnect.pc
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.06-1
+- new upstream release
+- add BuildRequires: p11-kit-devel, vpnc
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.02-1
 - new upstream release
 

+ 4 - 1
v/vpnc/vpnc-vl.spec

@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.3
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 Summary(ja):    Cisco 機器互換の IPSec VPN クライアント
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.3-2
+- rebuild with VineSeed environment
+
 * Tue May 26 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.3-1
 - initial build for Vine Linux