Browse Source

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

	* dar, sitecopy: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9080 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
690428305b
2 changed files with 34 additions and 22 deletions
  1. 12 6
      d/dar/dar-vl.spec
  2. 22 16
      s/sitecopy/sitecopy-vl.spec

+ 12 - 6
d/dar/dar-vl.spec

@@ -1,8 +1,8 @@
 Name:           dar
 Summary:        Disk ARchive: Backup directory tree and files
 Summary(ja):    ディスクアーカイブ: ディレクトリツリーとファイルをバックアップ
-Version:        2.4.11
-Release:        2%{?_dist_release}
+Version:        2.4.15
+Release:        1%{?_dist_release}
 
 Group:          Applications/Archiving
 License:        GPLv2+
@@ -11,13 +11,13 @@ URL:            http://dar.linux.free.fr/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
-BuildRequires:  lzo-devel
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libattr-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  openssl-devel
-BuildRequires:  libattr-devel
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  lzo-devel
+BuildRequires:  zlib-devel
 
 Requires:       par2cmdline
 
@@ -32,6 +32,7 @@ and symbolic links.
 
 %package -n libdar
 Summary:    Library providing support for the DAR API
+Summary(ja): DAR API をサポートするライブラリ
 Group:      System Environment/Libraries
 
 %description -n libdar
@@ -39,6 +40,7 @@ Common library code for DAR.
 
 %package -n libdar-devel
 Summary:    Development files for libdar
+Summary(ja): libdar の開発用ファイル
 Group:      Development/Libraries
 Requires:   libdar = %{version}-%{release}
 
@@ -112,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 11 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.4.15-1
+- new upstream release
+- built with libgcrypt 1.6.0
+
 * Sun Jan 12 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.11-2
 - rebuilt with current environment.
 

+ 22 - 16
s/sitecopy/sitecopy-vl.spec

@@ -2,18 +2,17 @@ Name: sitecopy
 Summary: sitecopy is for easily maintaining remote web sites.
 Summary(ja): sitecopy はリモートでのウェブサイトの管理を楽にします。
 Version: 0.16.6
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
-License: GPLv2
+License: GPLv2+
 Group: Applications/Internet
 URL: http://www.manyfish.co.uk/sitecopy/
 
 Source0: http://www.manyfish.co.uk/sitecopy/%{name}-%{version}.tar.gz
-
-Patch0: sitecopy-neon-0.29-vine.patch
+Patch0: configure-%{version}.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: neon-devel zlib-devel
+BuildRequires: neon-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -32,34 +31,41 @@ sitecopy はリモートでのウェブサイトの管理を楽にします。
 
 %prep
 %setup -q
-%patch0 -p1 -b .vine
+%patch0 -p1 -b .configure
+
+# Forcibly prevent use of bundled neon/expat/gettext sources.
+rm -r lib/neon/*.[ch] intl/*.[ch]
 
 %build
-%configure
-%__make
+%configure --with-neon
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove unpacked files
-%{__rm} -rf $RPM_BUILD_ROOT%{_prefix}/doc
-%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr
+rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{_mandir}/fr
+
+%find_lang %{name}
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS COPYING ChangeLog NEWS README README.gnome THANKS TODO
+%doc COPYING ChangeLog NEWS README THANKS TODO
 %doc doc/update.sh
 %{_bindir}/sitecopy
 #%{_mandir}/*/man1/sitecopy.1.gz
 %{_mandir}/man1/sitecopy.1.gz
-%{_datadir}/locale/*/*/sitecopy.mo
 %{_datadir}/sitecopy
 
 %changelog
+* Tue Nov 11 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.16.6-3
+- updated Patch0
+
 * Mon May 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.16.6-2
 - add Patch0 (sitecopy-neon-0.29-vine.patch)