Browse Source

2015-02-26 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* djvulibre: rebuilt
	* libnet: updated
	* net-snmp: fixed dependency
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9387 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
3c77b5a1a0
3 changed files with 38 additions and 26 deletions
  1. 15 8
      d/djvulibre/djvulibre-vl.spec
  2. 16 16
      lib/libn/libnet/libnet-vl.spec
  3. 7 2
      n/net-snmp/net-snmp-vl.spec

+ 15 - 8
d/djvulibre/djvulibre-vl.spec

@@ -2,17 +2,18 @@ Summary: DjVu viewers, encoders and utilities.
 Summary(ja): DjVu 画像形式ファイル操作用ライブラリ、ツール
 Name: djvulibre
 Version: 3.5.25.3
-Release: 1%{?_dist_release}
-License: GPL
+Release: 2%{?_dist_release}
+License: GPLv2
 Group: System Environment/Libraries
+URL: http://djvu.sourceforge.net
+
 Source0: http://prdownloads.sourceforge.net/djvu/djvulibre-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-URL: http://djvu.sourceforge.net
 BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel
 BuildRequires: glibc-devel
 BuildRequires: inkscape
-Requires: libtiff, libjpeg, glibc-devel
+
 Distribution: Project Vine
 Vendor: Vine Linux
 Packager: owa
@@ -45,7 +46,8 @@ DjVulibre-3.5 contains:
 %package devel
 Summary: The libraries and header files needed for djvulibre development.
 Group: Development/Libraries
-Requires: djvulibre = %{version}
+Requires: %{name} = %{version}-%{release}
+
 %description devel
 DjVulibre libraries and header files for development.
 
@@ -77,16 +79,16 @@ rm -rf doc/CVS 2>/dev/null || :
 
 %preun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
 %defattr(-, root, root)
-%doc README COPYRIGHT COPYING INSTALL NEWS TODO doc
+%doc README COPYRIGHT COPYING NEWS doc
 %{_bindir}
-%{_libdir}
-%exclude %{_libdir}/pkgconfig
+%{_libdir}/lib*.so.*
 %exclude %{_libdir}/libdjvulibre.la
 %exclude %{_datadir}/djvu/osi/de/*
 %exclude %{_datadir}/djvu/osi/fr/*
@@ -102,10 +104,15 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-, root, root)
 %{_includedir}/libdjvu
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/ddjvuapi.pc
 
 
 %changelog
+* Thu Feb 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.5.25.3-2
+- rebuilt on current VineSeed
+- moved %{_libdir}/lib*.so to devel subpackage
+
 * Sun Jul 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.25.3-1
 - update to 3.5.25.3
 - remove BuildRequires: qt-devel

+ 16 - 16
lib/libn/libnet/libnet-vl.spec

@@ -1,12 +1,13 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
-Version:	1.1.5
+Version:	1.1.6
 Release:	1%{?_dist_release}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
-Source:		http://downloads.sourceforge.net/libnet-dev/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://downloads.sourceforge.net/libnet-dev/%{name}-%{version}.tar.gz
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -21,6 +22,7 @@ complementary functionality.
 
 %package devel
 Summary:	Development files for the libnet library
+Summary(ja):	libnet ライブラリの開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -35,23 +37,18 @@ and sample test code for more detailed information.
 
 # Keep the sample directory untouched by make
 rm -rf __dist_sample
-mkdir __dist_sample
+mkdir -p __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure --libdir=/%{_lib}
+%configure
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL='install -p' install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
-rm -f %{buildroot}/%{_lib}/%{name}.{a,la,so}
-pushd %{buildroot}/%{_lib}
-mkdir -p %{buildroot}%{_libdir}
-ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) %{buildroot}%{_libdir}/%{name}.so
-popd
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -65,7 +62,7 @@ mv -f __dist_sample/sample/libnet_test.h{.new,}
 rm -f doc/html/Makefile*
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -74,11 +71,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-/%{_lib}/%{name}.so.*
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/BUGS doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING
+%doc doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING
 %doc doc/RAWSOCKET_NON_SEQUITUR doc/TODO doc/html/ __dist_sample/sample/
 %{_bindir}/%{name}-config
 %{_libdir}/%{name}.so
@@ -87,6 +84,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Thu Feb 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.1.6-1
+- updated to 1.1.6
+
 * Thu Mar 15 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.1.5-1
 - updated to 1.1.5; spec revamped
 

+ 7 - 2
n/net-snmp/net-snmp-vl.spec

@@ -5,7 +5,7 @@ Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
 Version: 5.7.2.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -86,7 +86,9 @@ net-snmp-utils パッケージは NET-SNMP ネットワーク管理プロジェ
 Group: Development/Libraries
 Summary: The development environment for the NET-SNMP project.
 Summary(ja): NET-SNMP 用の開発環境
-Requires: net-snmp = %{version}, elfutils-libelf-devel
+Requires: net-snmp = %{version}
+Requires: elfutils-libelf-devel
+Requires: openssl-devel
 Obsoletes: cmu-snmp-devel ucd-snmp-devel
 
 %description devel
@@ -359,6 +361,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Feb 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.7.2.1-2
+- added R: openssl-devel to devel subpackage
+
 * Thu Jul  3 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.7.2.1-1
 - new upstream release.