Browse Source

glib2,gtk3,clutter: new upstream release, PyQt4, net-snmp: fix package

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3003 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 13 years ago
parent
commit
daa564fd4a
5 changed files with 38 additions and 13 deletions
  1. 12 7
      P/PyQt4/PyQt4-vl.spec
  2. 5 2
      c/clutter/clutter-vl.spec
  3. 4 1
      g/glib2/glib2-vl.spec
  4. 4 1
      g/gtk3/gtk3-vl.spec
  5. 13 2
      n/net-snmp/net-snmp-vl.spec

+ 12 - 7
P/PyQt4/PyQt4-vl.spec

@@ -1,7 +1,6 @@
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-%global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
 
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.2)
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
@@ -12,14 +11,14 @@ Name: 	 PyQt4
 Summary: Python bindings for Qt4
 Summary(ja): Qt4 の Python バインディング
 Version: 4.8.3
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 Group: 	 Development/Languages
 URL:     http://www.riverbankcomputing.com/software/pyqt/
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
-Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
+Patch1:  PyQt-x11-gpl-4.8.3-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
@@ -37,8 +36,8 @@ BuildRequires: python-devel
 # beware of PyQt4/qscintilla bootstap issues
 #BuildRequires: qscintilla
 BuildRequires: qt4-devel >= 4.5.0
-BuildRequires: sip-devel >= 4.9
-Requires: sip >= %{sip_ver}
+BuildRequires: sip-devel >= 4.12.1
+Requires: sip >= 4.12.1
 Requires: dbus-python
 Requires: qt4
 
@@ -49,7 +48,7 @@ These are Python bindings for Qt4.
 Summary: Files needed to build other bindings based on Qt4
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: sip-devel >= 4.9
+Requires: sip-devel >= 4.12.1
 
 %description devel
 Files needed to build other bindings for C++ classes that inherit from any
@@ -58,7 +57,9 @@ of the Qt4 classes (e.g. KDE or your own).
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
-#patch1 -p1 -b .64bit
+%ifarch x86_64
+%patch1 -p1 -b .64bit
+%endif
 %patch2 -p1 -b .QT_SHARED
 #patch4 -p1 
 
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 %changelog
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.3-4
+- re-add Patch1 (PyQt-x11-gpl-4.8.3-64bit.patch) (x86_64 only)
+- remove %%sip_ver
+
 * Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.3-3
 - rebuilt with qt4-4.7.2
 

+ 5 - 2
c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.6.6
+%define         clutter_version 1.6.8
 %define         clutter_release 1%{?_dist_release}
 
 Name:           clutter
@@ -10,7 +10,7 @@ Summary(ja):    リッチなGUIを作成するためのオープンソースラ
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
+Source0:        http://www.clutter-project.org/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
 
 # http://bugzilla.openedhand.com/show_bug.cgi?id=2100
 Patch0:         Use-a-native-format-for-atlas-textures.patch
@@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.8-1
+- new upstream release
+
 * Tue Feb 22 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.6-1
 - new upstream release
 

+ 4 - 1
g/glib2/glib2-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 Summary: A library of handy utility functions.
 Name: glib2
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.2-1
+- new upstream release
+
 * Sat Feb 19 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.1-1
 - new upstream release
 

+ 4 - 1
g/gtk3/gtk3-vl.spec

@@ -13,7 +13,7 @@
 %define gobject_introspection_version 0.10.0
 
 
-%define base_version 3.0.1
+%define base_version 3.0.2
 %define bin_version 3.0.0
 
 # biarch support
@@ -307,6 +307,9 @@ fi
 %endif
 
 %changelog
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
+- new upstream release
+
 * Fri Feb 22 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-1
 - new upstream release
 

+ 13 - 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.6.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -156,13 +156,21 @@ perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
 # First build the static library
 # XXX remove privacy support?
 
+MIBS="host agentx smux \
+     ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
+     ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
+     ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
+     ip-mib/ipDefaultRouterTable/ipDefaultRouterTable \
+     ip-mib/ipv6ScopeZoneIndexTable ip-mib/ipIfStatsTable \
+     sctp-mib rmon-mib etherlike-mib"
+
 %configure \
 	--enable-static --enable-shared			\
 	--with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT" \
 	--with-sys-location="Unknown"			\
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
-	--with-mib-modules="host agentx smux"		\
+	--with-mib-modules="$MIBS"			\
 	--with-libwrap=%{_libdir}        		\
 	--sysconfdir=%{_sysconfdir}			\
 	--enable-ipv6					\
@@ -355,6 +363,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.6.1-3
+- change configure option (--with-mib-modules)
+
 * Tue Jan 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.6.1-2
 - merge spec, patch, source from FC package