--force-log

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

d/duplicity/duplicity-vl.spec

@@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
-* Sat Jan 26 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.21-1
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.21-1
 - new upstream release
 
 * Fri Nov 30 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.20-1
@@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
 - autodetect python version
 - require librsync >=0.9.6
 
-* Sun Aug 30 2002 Ben Escoto <bescoto@stanford.edu>
+* Fri Aug 30 2002 Ben Escoto <bescoto@stanford.edu>
 - Initial RPM

e/e16/e16-vl.spec

@@ -1,7 +1,7 @@
 Summary: The Enlightenment window manager, DR16.
 Summary(ja): Enlightenment ウィンドウマネージャ(DR16)
 Name: e16
-Version: 1.0.11
+Version: 1.0.12
 Release: 1%{?_dist_release}
 License: BSD
 Group: User Interface/Desktops
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*
 
 %changelog
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.0.12-1
+- new upstream release
+
 * Thu Oct 04 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.0.11-1
 - new upstream release
 

g/geany-plugins/geany-plugins-vl.spec

@@ -3,7 +3,7 @@
 
 Name:           geany-plugins
 Version:        1.23
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Plugins for Geany
 Summary(ja):    Geany のプラグイン集
 
@@ -45,6 +45,7 @@ Requires:  %{name}-updatechecker %{name}-webhelper
 Requires:  %{name}-debugger %{name}-xmlsnippets %{name}-geanymacro %{name}-geanynumberedbookmarks
 Requires:  %{name}-geanypg %{name}-gproject %{name}-tableconvert
 Requires:  %{name}-geanyminiscript %{name}-geniuspaste %{name}-multiterm
+Requires:  %{name}-commander %{name}-markdown %{name}-scope
 
 %description
 Plugins for Geany. Plugins included are:
@@ -872,6 +873,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.23-2
+- fixed meta package
+
 * Sat Mar 23 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.23-1
 - new upstream release
 - deleted Patch0

m/midori/midori-vl.spec

@@ -1,7 +1,7 @@
 Summary:	A lightweight GTK+ web browser
 Summary(ja):	軽量な GTK+ ウェブブラウザ
 Name:		midori
-Version:	0.4.8
+Version:	0.4.9
 Release:        1%{?_dist_release}
 
 Group:		Applications/Internet
@@ -156,6 +156,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/%{name}-0.4/
 
 %changelog
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.9-1
+- new upstream release
+- refreshed patch0
+
 * Sun Feb 10 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.8-1
 - new upstream release
 - fixed %%configure option

m/mirage/mirage-vl.spec

@@ -2,14 +2,14 @@
 
 Name:		mirage
 Version:	1.0
-Release:	3.svn391%{?_dist_release}
+Release:	4.svn400%{?_dist_release}
 Summary:	A fast and simple image viewer
 Summary(ja):	高速でシンプルな画像ビューア
 
 Group:		Applications/Graphics
 License:	GPLv3+
 URL:		http://mirageiv.berlios.de/
-Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}-svn391.tar.bz2
+Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}-svn400.tar.bz2
 Source1:	mirage_ja.po
 Patch0:        setup.patch
 
@@ -93,6 +93,10 @@ desktop-file-install \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-4.svn400
+- new upstream snapshot
+- updated Source1
+
 * Fri Dec 14 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-3.svn391
 - new upstream snapshot
 - updated Source1

v/vsftpd/vsftpd-vl.spec

@@ -2,7 +2,7 @@
 
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
-Version: 2.0.7
+Version: 3.0.2
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -14,46 +14,57 @@ Source3: vsftpd.ftpusers
 Source4: vsftpd.user_list
 Source5: vsftpd.init
 Source6: vsftpd_conf_migrate.sh
-Patch1: vsftpd-2.0.1-vine-20041227.patch
+Source7: vsftpd.service
-Patch2: vsftpd-1.0.1-missingok.patch
+
-Patch3: vsftpd-2.0.1-tcp_wrappers.patch
-Patch4: vsftpd-1.5.1-libs.patch
-Patch5: vsftpd-2.0.2-signal.patch
-Patch6: vsftpd-1.2.1-conffile.patch
-Patch7: vsftpd-2.0.1-build_ssl.patch
-Patch8: vsftpd-2.0.1-server_args.patch
-Patch9: vsftpd-2.0.1-dir.patch
-Patch11: vsftpd-1.2.1-nonrootconf.patch
-Patch13: vsftpd-2.0.3-background.patch
-Patch14: vsftpd-2.0.3-daemonize_fds.patch
-Patch17: vsftpd-2.0.3-pam_hostname.patch
-Patch18: vsftpd-close-std-fds.patch
-Patch19: vsftpd-2.0.5-default_ipv6.patch
-Patch20: vsftpd-2.0.5-add_ipv6_option.patch
-Patch21: vsftpd-2.0.5-correct_comments.patch
-Patch22: vsftpd-2.0.5-man.patch
-Patch23: vsftpd-2.0.4-filter.patch
-Patch26: vsftpd-2.0.5-bind_denied.patch
-Patch29: vsftpd-2.0.5-pasv_dot.patch
-Patch30: vsftpd-2.0.5-pam_end.patch
-Patch31: vsftpd-2.0.5-write_race.patch
-Patch32: vsftpd-2.0.5-fix_unique.patch
-Patch34: vsftpd-2.0.5-underscore_uname.patch
-Patch35: vsftpd-2.0.5-uname_size.patch
-Patch36: vsftpd-2.0.5-greedy.patch
-Patch37: vsftpd-2.0.6-userlist_log.patch
-Patch38: vsftpd-2.0.6-listen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+# Build patches
+Patch1: vsftpd-2.1.0-libs.patch
+Patch2: vsftpd-2.1.0-build_ssl.patch
+Patch3: vsftpd-2.1.0-tcp_wrappers.patch
+
+# Use /etc/vsftpd/ instead of /etc/
+Patch4: vsftpd-2.1.0-configuration.patch
+
+# These need review
+Patch5: vsftpd-2.1.0-pam_hostname.patch
+Patch6: vsftpd-close-std-fds.patch
+Patch7: vsftpd-2.1.0-filter.patch
+Patch9: vsftpd-2.1.0-userlist_log.patch
+
+Patch10: vsftpd-2.1.0-trim.patch
+Patch12: vsftpd-2.1.1-daemonize_plus.patch
+Patch14: vsftpd-2.2.0-wildchar.patch
+
+Patch16: vsftpd-2.2.2-clone.patch
+Patch19: vsftpd-2.3.4-sd.patch
+Patch20: vsftpd-2.3.4-sqb.patch
+Patch21: vsftpd-2.3.5-aslim.patch
+Patch22: vsftpd-3.0.0-tz.patch
+Patch23: vsftpd-3.0.0-xferlog.patch
+Patch24: vsftpd-3.0.0-logrotate.patch
+
+Patch25: 07-utf8.patch
+
+#Vine custom
+Patch100: vsftpd-vine.patch
+
 %if %{tcp_wrappers}
-BuildPrereq: tcp_wrappers
+BuildRequires: tcp_wrappers
 %endif
-BuildRequires: pam-devel
+
-Requires: pam
 BuildRequires: libcap-devel
-Requires: libcap
+BuildRequires: pam-devel
 BuildRequires: openssl-devel
-Requires: openssl
+
+Requires: libcap
 Requires: logrotate
+Requires: openssl
+Requires: pam
+
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
 Provides: ftpserver
 
 %description
@@ -62,38 +73,32 @@ scratch.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .vine
+cp %{SOURCE1} .
-%patch2 -p1 -b .mok
+
+%patch1 -p1 -b .libs
+%patch2 -p1 -b .build_ssl
 %if %{tcp_wrappers}
 %patch3 -p1 -b .tcp_wrappers
 %endif
-%patch4 -p1 -b .libs
+%patch4 -p1 -b .configuration
-cp %{SOURCE1} .
+%patch5 -p1 -b .pam_hostname
-%patch5 -p1 -b .signal
+%patch6 -p1 -b .close_fds
-%patch6 -p1
+%patch7 -p1 -b .filter
-%patch7 -p1 -b .build_ssl
+%patch9 -p1 -b .userlist_log
-%patch8 -p1 -b .server_args
+%patch10 -p1 -b .trim
-%patch9 -p1 -b .dir
+%patch12 -p1 -b .daemonize_plus
-%patch11 -p1 -b .nonrootconf
+%patch14 -p1 -b .wildchar
-%patch13 -p1 -b .background
+%patch16 -p1 -b .clone
-%patch14 -p1 -b .fds
+%patch19 -p1 -b .sd
-%patch17 -p1 -b .old-pam
+%patch20 -p1 -b .sqb
-%patch18 -p1 -b .close-fds
+%patch21 -p1 -b .aslim
-%patch19 -p1 -b .ipv6
+%patch22 -p1 -b .tz
-%patch20 -p1 -b .ipv6opt
+%patch23 -p1 -b .xferlog
-%patch21 -p1 -b .comments
+%patch24 -p1 -b .logrotate
-%patch22 -p1 -b .manp
+
-%patch23 -p1 -b .filter
+%patch25 -p1
-%patch26 -p1 -b .bind_denied
+
-%patch29 -p1 -b .pasv_dot
+%patch100 -p1 -b .vine_custom
-%patch30 -p1 -b .pam_end
-%patch31 -p1 -b .write_race
-%patch32 -p1 -b .fix_unique
-%patch34 -p1 -b .underscore_uname
-%patch35 -p1 -b .uname_size
-%patch36 -p1 -b .greedy
-%patch37 -p1 -b .userlist_log
-%patch38 -p1 -b .listen
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe" \
@@ -101,16 +106,17 @@ make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe" \
      %{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/etc
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT/etc/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{5,8}
-install -m 755 vsftpd  $RPM_BUILD_ROOT/usr/sbin/vsftpd
+
-install -m 600 vsftpd.conf $RPM_BUILD_ROOT/etc/vsftpd/vsftpd.conf
+install -m 755 vsftpd  $RPM_BUILD_ROOT%{_sbindir}/vsftpd
+install -m 600 vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd.conf
 install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd.log
+install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vsftpd
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vsftpd
 install -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/ftpusers
 install -m 600 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/user_list
@@ -118,7 +124,6 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/vsftpd
 install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd_conf_migrate.sh
 
 mkdir -p $RPM_BUILD_ROOT/var/ftp/pub
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/empty
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -132,23 +137,32 @@ if [ $1 = 0 ]; then
  /sbin/service vsftpd stop > /dev/null 2>&1
  /sbin/chkconfig --del vsftpd
 fi
-  
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
-/usr/sbin/vsftpd
+%{_sbindir}/vsftpd
-/etc/rc.d/init.d/vsftpd
+%dir %{_sysconfdir}/vsftpd
-%dir /etc/vsftpd
+%{_sysconfdir}/vsftpd/vsftpd_conf_migrate.sh
-%config(noreplace) /etc/vsftpd/*
+%{_sysconfdir}/rc.d/init.d/vsftpd
-%config(noreplace) /etc/pam.d/vsftpd
+%config(noreplace) %{_sysconfdir}/vsftpd/ftpusers
-%config(noreplace) /etc/logrotate.d/vsftpd.log
+%config(noreplace) %{_sysconfdir}/vsftpd/user_list
-%doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD SPEED TODO BENCHMARKS COPYING SECURITY/ EXAMPLE/ TUNING SIZE vsftpd.xinetd
+%config(noreplace) %{_sysconfdir}/vsftpd/vsftpd.conf
+%config(noreplace) %{_sysconfdir}/pam.d/vsftpd
+%config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd
+%doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD
+%doc SPEED TODO BENCHMARKS COPYING SECURITY/ EXAMPLE/ TUNING SIZE vsftpd.xinetd
 %{_mandir}/man5/vsftpd.conf.*
 %{_mandir}/man8/vsftpd.*
-/var/ftp
+%{_var}/ftp
-%{_datadir}/empty
+
 
 %changelog
+* Sat Mar 30 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.0.2-1
+- new upstream release
+- synced Fedora rawhide sources
+  - deleted customized configure for IPv6 in Patch4
+- added Patch25 from Debian to add UTF-8 support
+
 * Mon Oct  6 2008 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.0.7-1
 - new upstream release
 - update patches from FedoraCore
@@ -165,7 +179,7 @@ fi
 - new upstream release
 - disable patch5
 
-* Mon Nov 27 2004 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.0.1-5vl2
+* Sat Nov 27 2004 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.0.1-5vl2
 - rename patch1 and disable anonymous FTP
 
 * Mon Oct 18 2004 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.0.1-5vl1
@@ -284,7 +298,7 @@ fi
 - don't spit out ugly errors if anonftp isn't installed (#62987)
 - fix horribly broken userlist setup (#62321)
 
-* Thu Feb 28 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.0.1-4
+* Thu Feb 28 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.0.1-4
 - s/Copyright/License/
 - add "missingok" to the logrotate script, so we don't get errors
   when nothing has happened
@@ -314,10 +328,10 @@ fi
 * Wed Feb 7 2001 Seth Vidal <skvidal@phy.duke.edu>
 - updated to 0.0.11
 
-* Fri Feb 1 2001 Seth Vidal <skvidal@phy.duke.edu>
+* Thu Feb 1 2001 Seth Vidal <skvidal@phy.duke.edu>
 - Update to 0.0.10
 
-* Fri Feb 1 2001 Seth Vidal <skvidal@phy.duke.edu>
+* Thu Feb 1 2001 Seth Vidal <skvidal@phy.duke.edu>
 - First RPM packaging
 - Stolen items from wu-ftpd's pam setup
 - Separated rh 7 and rh 6.X's packages