Browse Source

net-snmp:new upstream release, gnome-panel:create libs and devel package

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1491 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 14 years ago
parent
commit
c530685a37
2 changed files with 53 additions and 14 deletions
  1. 41 4
      g/gnome-panel/gnome-panel-vl.spec
  2. 12 10
      n/net-snmp/net-snmp-vl.spec

+ 41 - 4
g/gnome-panel/gnome-panel-vl.spec

@@ -7,6 +7,7 @@
 %define gtk2_version 2.20.0
 %define libgnome_version 2.30.0
 %define libgnomeui_version 2.24.3
+%define libbonoboui_version 2.24.3
 %define orbit_version 2.14.17
 %define libwnck_version 2.30.0
 %define gconf_version 2.28.0
@@ -23,7 +24,7 @@ Summary: GNOME panel
 Summary(ja): GNOME パネル
 Name: gnome-panel
 Version: 2.30.2
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 URL: http://www.gnome.org/
 License: GPL 
 Group: User Interface/Desktops
@@ -57,6 +58,7 @@ Patch11: applet-error.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Requires: %{name}-libs = %{version}-%{release}
 Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: libwnck >= %{libwnck_version}
 Requires: gnome-menus >= %{gnome_menus_version}
@@ -118,6 +120,34 @@ features for the GNOME desktop.
 GNOME パネルは、ウィンドウ一覧・ワークスペース切り換え器・メニューその他の
 特徴を GNOME デスクトップに提供します。
 
+%package libs
+Summary: Libraries for use in panel applets of GNOME
+Summary(ja): GNOME のパネルアップレットで使用するライブラリ
+Group: System Environment/Libraries
+
+%description libs
+Libraries for use in panel applets of GNOME.
+
+%description libs -l ja
+GNOME のパネルアップレットで使用するライブラリ
+
+%package devel
+Summary: Development environment for panel applets of GNOME
+Summary(ja): GNOME のパネルアップレット用開発環境
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: pkgconfig
+Requires: gtk2-devel >= %{gtk2_version}
+Requires: libbonoboui-devel >= %{libbonoboui_version}
+Requires: GConf2-devel >= %{gconf_version}
+
+%description devel
+Header files and libraries for building a panel applets of GNOME.
+
+%description devel -l ja
+GNOME のパネルアップレットをビルドするためのヘッダファイル及びライブラリ集
+
+
 %prep
 %setup -q
 
@@ -272,23 +302,30 @@ fi
 %{_datadir}/gnome-2.0/ui/*
 %{_mandir}/man*/*
 %{_bindir}/*
+%exclude %{_bindir}/panel-test-applets
 %{_libexecdir}/*
 %{_libdir}/bonobo/servers/*.server
-%{_libdir}/*.so.*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/gconf/schemas/*.entries
-
 %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
 %{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 
-# theoretically a devel package, but just doesn't seem worth it
+%files libs
+%{_libdir}/*.so.*
+
+%files devel
+%{_bindir}/panel-test-applets
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/panel-2.0
 %{_libdir}/*.so
 %{_datadir}/gtk-doc
 
+
 %changelog
+* Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-2
+- create -libs and -devel package
+
 * Tue Jun 22 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-1
 - new upstream release
 

+ 12 - 10
n/net-snmp/net-snmp-vl.spec

@@ -4,8 +4,8 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
-Version: 5.4.2.1
-Release: 4%{?_dist_release}
+Version: 5.4.3
+Release: 1%{?_dist_release}
 License: BSDish
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz
@@ -18,7 +18,8 @@ Source6: net-snmp-config.h
 Source7: net-snmp-config
 Source8: net-snmp-trapd.redhat.conf
 
-Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
+## Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
+Patch1: net-snmp-5.4.3-mnttab.patch
 Patch2: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch3: net-snmp-5.0.8-readonly.patch
 Patch4: net-snmp-5.4.1-pie.patch
@@ -30,13 +31,13 @@ Patch9: net-snmp-5.4.1-config_libdir.patch
 # Patch10: net-snmp-5.4.1-ethtool-config.patch
 Patch11: net-snmp-5.4.1-strange_libpath.patch
 # Patch12: net-snmp-5.4.1-hostname.patch
-Patch13: net-snmp-5.4.2.1-shared-ip.patch
+Patch13: net-snmp-5.4.3-shared-ip.patch
 # Patch14: net-snmp-5.4-exec-crash.patch
 Patch15: net-snmp-5.1.2-snmpconf-selinux.patch
 Patch16: net-snmp-5.4.1-sensors3.patch
 Patch17: net-snmp-5.4.1-xen-crash.patch
 
-Prereq: /sbin/chkconfig
+Requires(pre): /sbin/chkconfig
 Obsoletes: cmu-snmp ucd-snmp
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers, openssl-devel, bzip2-devel, elfutils-libelf-devel
@@ -255,11 +256,6 @@ pushd perl
 make PREFIX=${RPM_BUILD_ROOT}/%{_prefix} install_vendor
 eval $(perl '-V:installvendorlib')
 
-# Urgs, what an evil hack. Brrr.
-%if "%{_libdir}" == "/usr/lib64"
-installvendorlib=`echo $installvendorlib | sed 's/lib/lib64/'`
-%endif
-
 find $RPM_BUILD_ROOT%{_libdir} -name Makefile.subs.pl | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir} -name perllocal.pod | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir} -name .packlist | xargs rm -f
@@ -353,6 +349,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.4.3-1
+- new upstream release
+- update Patch1 for net-snmp-5.4.3
+- update Patch13 for net-snmp-5.4.3
+- fix %install 
+
 * Tue Feb 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.4.2.1-4
 - rebuild with rpm-4.8.0