2014-12-17 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* clutter-gtkmm, clutter, icewm: updated
	* nss_ldap: rebuilt
	* openldap: added patch
	


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

c/clutter-gtkmm/clutter-gtkmm-vl.spec

@@ -3,20 +3,21 @@
 Summary: A C++ wrapper for clutter-gtkmm
 Summary(ja): clutter-gtkmm の C++ ラッパー
 Name: clutter-gtkmm
-Version: 0.9.6
+Version: 1.6.0
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/clutter-gtkmm/0.9/%{name}-%{version}.tar.bz2
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/clutter-gtkmm/1.6/%{name}-%{version}.tar.xz
 
-Requires:	clutter-gtk >= 0.10.4
+Buildroot: %{_tmppath}/%{name}-%{version}-root
-Requires:	cluttermm >= 0.9.6
+BuildRequires:	clutter-gtk-devel >= 1.6.0
-Requires:	gtkmm2 >= 2.18.0
-BuildRequires:	clutter-gtk-devel >= 0.10.4
 BuildRequires:	cluttermm-devel >= 0.9.6
-BuildRequires:	gtkmm2-devel >= 2.18.0
+BuildRequires:	gtkmm3-devel >= 3.6.0
+BuildRequires:	mm-common
+Requires:	clutter-gtk >= 1.6.0
+Requires:	cluttermm >= 0.9.6
+Requires:	gtkmm3 >= 3.6.0
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -31,9 +32,6 @@ Summary: 	Development tools for clutter-gtkmm applications.
 Summary(ja): 	clutter-gtkmm アプリケーションの開発用ファイル
 Group: 		Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	clutter-gtk-devel >= 0.10.4
-Requires:	cluttermm-devel >= 0.9.6
-Requires:	gtkmm2-devel >= 2.18.0
 
 %description devel
 Header files and libraries for building a extension library for the clutter-gtkmm.
@@ -86,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{ver}/examples
 %{_datadir}/devhelp/books/*
 
 %changelog
+* Wed Dec 17 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.6.0-1
+- new upstream release
+- add BuildRequires: gtkmm3-devel, mm-common
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

c/cluttermm/cluttermm-vl.spec

@@ -3,21 +3,23 @@
 Summary: A C++ wrapper for Clutter
 Summary(ja): Clutter の C++ ラッパー
 Name: cluttermm
-Version: 1.3.3
+Version: 1.17.3
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/cluttermm/1.3/%{name}-%{version}.tar.xz
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/cluttermm/1.17/%{name}-%{version}.tar.xz
 
-Requires:	clutter >= 1.3.8
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires:	atkmm >= 2.22.2
+Requires:	clutter >= 1.18.0
+Requires:	gtkmm3 >= 3.10
 Requires:	pangomm >= 2.27.1
-BuildRequires:	clutter-devel >= 1.3.8
 BuildRequires:	atkmm-devel >= 2.22.2
+BuildRequires:	clutter-devel >= 1.18.0
+BuildRequires:	gtkmm3-devel >= 3.10
 BuildRequires:	pangomm-devel >= 2.27.1
-BuildRequires:	mm-common
+#BuildRequires:	mm-common
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -33,7 +35,6 @@ Summary: 	Development tools for cluttermm applications.
 Summary(ja): 	cluttermm アプリケーションの開発用ファイル
 Group: 		Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	clutter-devel >= 1.2.0
 
 %description devel
 Header files and libraries for building a extension library for the cluttermm.
@@ -87,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{ver}/examples
 %{_datadir}/%{name}-%{ver}/proc/m4/*.m4
 
 %changelog
+* Wed Dec 17 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.17.3-1
+- new upstream release
+- add BuildRequires: gtkmm3-devel
+- dropt BuildRequires: mm-common
+
 * Sun Oct 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.3-1
 - new upstream release
 - add BuildRequires: atkmm-devel, mm-common

i/icewm/icewm-vl.spec

@@ -1,38 +1,62 @@
-Summary: Fast and small X11 window manager
+Summary: Light and configurable window manager
-Summary(ja): 高速で軽量なウィンドウマネージャ
+Summary(ja): 軽量かつ柔軟なウィンドウマネージャ
 Name: icewm
-Version: 1.2.37
+Version: 1.3.8
-Release: 4%{?_dist_release}
+Release: 1%{?_dist_release}
-Source: http://ftp1.sourceforge.net/icewm/icewm-%{version}.tar.gz
-Source1: %{name}.desktop
-Source2: %{name}-1.2.32-ja.po
 
-# default menu file for Vine Linux
+License: LGPLv2+
-Source10: %{name}-menu.vine
+Group: User Interface/Desktops
-Source11: %{name}-toolbar.vine
+URL: http://www.icewm.org
 
-# addtional themes
+Source: http://downloads.sourceforge.net/icewm/%{name}-%{version}.tar.gz
-Source100: truecurve-default-1.0.4.tar.gz
+Source1: http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
-Source101: SilverXP-1.2.17-double-1.tar.bz2
+Source2: icewm.desktop
-Source102: icecrack-default-2.1.0.tar.gz
+Source3: icewm-startup
+# Source4: clearlooks-v3.tgz
 
-Patch0: icewm-1.2.37-gnome2.patch
+# default menu file for Vine Linux
+#Source10: %{name}-menu.vine
+#Source11: %{name}-toolbar.vine
 
-Patch101: icewm-1.2.37-makefile.patch
+# addtional themes
-Patch102: icewm-1.2.37-session.patch
+#Source100: truecurve-default-1.0.4.tar.gz
+#Source101: SilverXP-1.2.17-double-1.tar.bz2
+#Source102: icecrack-default-2.1.0.tar.gz
+
+Patch1: icewm-1.3.8-menu.patch
+Patch2:	icewm-toolbar.patch
+Patch3:	icewm-keys.patch
+Patch4:	icewm-1.3.8-fribidi.patch
+Patch5:	icewm-1.3.7-dso.patch
+Patch6:	icewm-defaults.patch
+Patch7:	icewm-1.3.7-menuiconsize.patch
+Patch8:	icewm-1.3.8-deprecated.patch
 
-URL: http://icewm.sourceforge.net/
-License: GPL
-Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: imlib-devel libpng-devel freetype2-devel
+BuildRequires: autoconf
-BuildRequires: gnome-desktop-devel startup-notification-devel
+BuildRequires: automake
-BuildRequires: gnome-vfs2-devel libgnomeui-devel
+BuildRequires: fribidi-devel
-BuildRequires: xorg-x11-font-utils
+BuildRequires: gdk-pixbuf2-devel
-BuildRequires: libSM-devel
+BuildRequires: giflib-devel
+BuildRequires: libICE-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXft-devel
+BuildRequires: libXt-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: gettext
+BuildRequires: gnome-desktop-devel
+BuildRequires: gnome-vfs2-devel
+BuildRequires: popt-devel
+BuildRequires: xorg-x11-proto-devel
+
+Requires: gnome-icon-theme
+Requires: alsa-utils
+Requires: xdg-utils
+Requires: xterm
+Requires: pyxdg
 
 Vendor: Project Vine
-Distribution: Vine Linu
+Distribution: Vine Linux
 
 # default apps
 # Prereq: mlterm firefox sylpheed
@@ -44,44 +68,61 @@ move/resize, task bar, window list, clock, mailbox, CPU, Network, APM
 status.
 
 %package menu-gnome2
-Summary: GNOME menu support for icewm (using gnome 2.x).
+Summary: GNOME menu support for IceWM window manager 
 Summary(ja): IceWM における GNOME メニューのサポート
 Group:    User Interface/Desktops
-Requires: icewm = %{version}
+Requires: icewm = %{version}-%{release}
-Requires: gnome-desktop-libs
+Requires: gnome-menus
 
 %description menu-gnome2
 GNOME menu support for icewm (using gnome 2.x).
 
 
 %prep
-%setup -q -a 100 -a 101 -a 102
+%setup -q 
-%patch0 -p1
+%patch1 -p0 -b .menu
-%patch101 -p1
+%patch2 -p1 -b .toolbar
-%patch102 -p1
+%patch3 -p1 -b .keys
-cp -p %{SOURCE2} po/ja.po
+%patch4 -p0 -b .fribidi
+%patch5 -p0 -b .dso
+%patch6 -p0 -b .defaults
+%patch7 -p1 -b .menuiconsize
+%patch8 -p0 -b .deprecated
 
-autoreconf -if
 
 %build
-%configure --enable-menus-gnome2
+autoreconf -vif
-make
+%configure \
+    --enable-gradients \
+    --enable-i18n \
+    --enable-menus-gnome2 \
+    --with-cfgdir=%{_sysconfdir}/icewm
+make %{?_smp_mflags}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
+install -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{_bindir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
 # installs default menu and toobar
-install -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/icewm/menu
+#install -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/icewm/menu
-install -m644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icewm/toolbar
+#install -m644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icewm/toolbar
 
 # installs additional themes
-cp -pr TrueCurve-1.0.4 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/TrueCurve
+#cp -pr TrueCurve-1.0.4 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/TrueCurve
-cp -pr icewm/themes/SilverXP-1.2.17-double-1 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/SilverXP
+#cp -pr icewm/themes/SilverXP-1.2.17-double-1 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/SilverXP
-cp -pr IceCrack2 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/IceCrack
+#cp -pr IceCrack2 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/IceCrack
 
 %find_lang %{name}
 
@@ -90,23 +131,31 @@ cp -pr IceCrack2 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/IceCrack
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS CHANGES COPYING INSTALL README TODO
+%doc AUTHORS BUGS CHANGES COPYING INSTALL README README.wm-session TODO
-%doc doc/*.html doc/icewm.sgml
+%doc doc/*.html
-%{_sysconfdir}/X11/dm/Sessions/%{name}.desktop
 %{_bindir}/icehelp
 %{_bindir}/icesh
 %{_bindir}/icewm
 %{_bindir}/icewm-session
+%{_bindir}/icewm-set-gnomewm
+%{_bindir}/icewm-xdg-menu*
 %{_bindir}/icewmbg
 %{_bindir}/icewmhint
 %{_bindir}/icewmtray
 %{_datadir}/icewm
+%{_datadir}/xsessions/icewm.desktop
+%{_mandir}/man1/icewm.1*
 
 %files menu-gnome2
 %defattr(-,root,root)
 %{_bindir}/icewm-menu-gnome2
 
+
 %changelog
+* Wed Dec 17 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 1.3.8-1
+- updated to 1.3.8
+- added patches from Fedora Core
+
 * Sat Sep 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.37-4
 - update Source10 (icewm-menu.vine)
 

n/nss_ldap/nss_ldap-vl.spec

@@ -5,7 +5,7 @@ Summary: NSS library and PAM module for LDAP
 Summary(ja): LDAP を利用する NSS ライブラリ および PAM モジュール
 Name: nss_ldap
 Version: 264
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 URL: http://www.padl.com/
 License: LGPLv2+
 Group: System Environment/Base
@@ -230,6 +230,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 264-4
+- rebuilt with cyrus-sasl 2.1.26
+
 * Sat Apr 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 264-3
 - rebuild with krb5-1.8.2
 

o/openldap/openldap-vl.spec

@@ -16,9 +16,11 @@ Summary: The configuration files, libraries and documentation for OpenLDAP.
 Summary(ja): OpenLDAP の設定ファイル，ライブラリ，ドキュメント.
 Name: openldap
 Version: 2.4.23
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: OpenLDAP
 Group: System Environment/Libraries
+URL: http://www.openldap.org/
+
 %if %{stable}
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-stable/openldap-stable-%{date}.tgz
 %else
@@ -58,6 +60,9 @@ Patch303: MigrationTools-26-suffix.patch
 Patch304: MigrationTools-46-schema.patch
 Patch305: MigrationTools-45-noaliases.patch
 
+# Vine Patches
+Patch700: openldap-2.4.23-libdb.patch
+
 # security fixes
 ## from CentOS 6.3; openldap 2.4.23-26.el6_3.2
 Patch1112: openldap-cve-ppolicy-forward-updates.patch
@@ -67,11 +72,10 @@ Patch1144: openldap-cve-nss-cipher-suite-ignored.patch
 ## based CentOS 6.3; openldap 2.4.23-26.el6_3.2
 Patch1145: openldap-VineLinux-cve-nss-default-cipher-suite-always-selected.patch
 
-URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool >= 2.2.6a
 BuildRequires: cyrus-sasl-devel, gdbm-devel, openssl-devel, perl
-BuildRequires: db4-devel >= 4.2, pam-devel, pkgconfig, tcp_wrappers
+BuildRequires: libdb-devel, pam-devel, pkgconfig, tcp_wrappers
 BuildRequires: unixODBC-devel, bind-devel, libtool-ltdl-devel >= 2.2.6a
 BuildRequires: krb5-devel
 BuildRequires: groff
@@ -228,6 +232,9 @@ pushd openldap-%{version}
 %patch6 -p1 -b .gethostbyname_r
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
+
+%patch700 -p1 -b .libdb
+
 # security
 %patch1112 -p1 -b .cve-ppolicy-forward-updates
 %patch1113 -p1 -b .cve-ndb-bind-rootdn
@@ -700,6 +707,9 @@ fi
 
 
 %changelog
+* Tue Dec 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.4.23-5
+- added Patch700 to build with libdb 5.3.28
+
 * Thu Jan  9 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 2.4.23-4
 - build with cyrus-sasl 2.1.26