Browse Source

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

	* automoc4, cagibi, gtkglext: rebuilt
	* libgphoto2, perl-{Clagg-Gomor, Data-Phrasebook-Loader-YAML,
	  Net-MAC-Vendor}: updated
	  


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9343 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
9feb2d0450

+ 4 - 1
a/automoc4/automoc4-vl.spec

@@ -1,7 +1,7 @@
 Name: automoc4
 Summary: automatic moc for Qt 4 packages
 Version: 0.9.88
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: Development/Tools
 License: BSD
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/automoc4/*
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.9.88-4
+- rebuilt on current VineSeed
+
 * Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.9.88-3
 - rebuilt with qt4-4.8.0
 

+ 7 - 2
c/cagibi/cagibi-vl.spec

@@ -1,9 +1,9 @@
 Name:           cagibi
 Summary:        SSDP (UPnP discovery) cache/proxy daemon
 Version:        0.2.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
-Group:          System Environment/Base
+Group:          System Environment/Daemons
 License:        GPLv2+ and LGPLv2+
 URL:            http://www.kde.org/
 
@@ -25,6 +25,8 @@ Cagibi is a cache/proxy daemon for SSDP (the discovery part of UPnP).
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+# disable copious debug output,  http://bugzilla.redhat.com/865964
+export CXXFLAGS="%{optflags} -DQT_NO_DEBUG_OUTPUT"
 %cmake ..
 popd
 
@@ -54,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.2.0-2
+- rebuilt on current VineSeed
+
 * Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.2.0-1
 - new upstream release
 

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

@@ -3,7 +3,7 @@ Summary: GtkGLExt is an OpenGL extension to GTK+ 2.0 or later.
 Summary(ja): GTK+ 2.0 以降の OpenGL 拡張
 Name: gtkglext
 Version: 1.2.0
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2.0-8
+- rebuilt on current VineSeed
+
 * Tue Apr 23 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0-7
 - do not apply patch1
 

+ 51 - 44
lib/libg/libgphoto2/libgphoto2-vl.spec

@@ -1,8 +1,8 @@
 Summary: Library for accessing digital cameras
 Summary(ja): デジタルカメラにアクセスするためのライブラリ
 Name: libgphoto2
-Version: 2.5.0
-Release: 2%{?_dist_release}
+Version: 2.5.7
+Release: 1%{?_dist_release}
 
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
@@ -16,7 +16,7 @@ Patch3: gphoto2-ixany.patch
 Patch5: gphoto2-device-return.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libusb-devel >= 0.1.6a
+#BuildRequires: libusb-devel >= 0.1.6a
 BuildRequires: libusb1-devel
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel
@@ -26,7 +26,7 @@ BuildRequires: popt-devel
 BuildRequires: dbus-devel
 BuildRequires: gd-devel
 # we run autoreconf:
-BuildRequires: autoconf, automake, libtool, gettext, cvs
+#BuildRequires: autoconf, automake, libtool, gettext, cvs
 Obsoletes: gphoto2 < 2.4.0
 Obsoletes: gphoto2-devel < 2.4.0
 
@@ -44,8 +44,8 @@ Summary: Headers and links to compile against the libgphoto2 library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libusb-devel >= 0.1.6a
-Requires: libusb1
+#Requires: libusb-devel >= 0.1.6a
+#Requires: libusb1-devel
 Requires: libexif-devel
 Obsoletes: gphoto2 < 2.4.0-11
 Obsoletes: gphoto2-devel < 2.4.0-11
@@ -67,32 +67,15 @@ use libgphoto2.
 %patch3 -p1 -b .ixany
 %patch5 -p1 -b .device-return
 
-for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB $(find -name 'README.*'); do
-        mv ${i} ${i}.old
-        iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
-        touch -r ${i}.old ${i} || :
-        rm -f ${i}.old
+for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
+    mv ${i} ${i}.old
+    iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
+    touch -r ${i}.old ${i} || :
+    rm -f ${i}.old
 done
-				
-# FIXME: These .pc.in files aren't actually being installed?
-cat > gphoto2.pc.in << \EOF
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-VERSION=@VERSION@
-
-Name: gphoto2
-Description: Library for easy access to digital cameras
-Requires:
-Version: @VERSION@
-Libs: -L${libdir} -lgphoto2 -lgphoto2_port -lm
-Cflags: -I${includedir} -I${includedir}/gphoto2
-EOF
-sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
 	udevscriptdir='/lib/udev' \
 	--with-drivers=all \
@@ -101,6 +84,13 @@ export CFLAGS=$RPM_OPT_FLAGS
 	--disable-rpath \
 	--without-aalib \
 	--without-hal
+
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libgphoto2_port/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libgphoto2_port/libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -113,8 +103,9 @@ install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
 export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
-grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+
+#$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
+#grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 
 # Output udev rules for device identification; this is used by GVfs gphoto2
 # backend and others.
@@ -125,19 +116,36 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
 $RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
 popd
 
-rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
-rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
-rm -rf %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_libdir}/*.la
+# remove circular symlink in /usr/include/gphoto2 (#460807)
+rm -f $RPM_BUILD_ROOT%{_includedir}/gphoto2/gphoto2
+
+# remove unneeded print-camera-list from libdir (#745081)
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgphoto2/print-camera-list
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgphoto2_port/*/*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+rm -f libgphoto.lang
 %find_lang %{name}-6
-%find_lang %{name}_port-10
-cat libgphoto2*.lang >> %{name}.lang
+%find_lang %{name}_port-12
+cat %{name}*.lang >> libgphoto.lang
+
+# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
+rm -rf __doc
+mkdir -p __doc
+mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/* __doc
+rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
 
-%files -f %{name}.lang
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f libgphoto.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS
 %dir %{_libdir}/libgphoto2_port
@@ -147,17 +155,13 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_libdir}/libgphoto2_port/*/*.so
 %{_libdir}/libgphoto2/*/*.so
 %{_libdir}/*.so.*
-%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+#{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 /lib/udev/rules.d/40-libgphoto2.rules
 /lib/udev/check-ptp-camera
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files devel
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
+%doc __doc/*
 %{_datadir}/libgphoto2
 %{_bindir}/gphoto2-config*
 %{_bindir}/gphoto2-port-config
@@ -168,6 +172,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5.7-1
+- updated to 2.5.7
+
 * Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.0-2
 - rebuilt with gd-2.1.0.
 

+ 10 - 2
p/perl-Class-Gomor/perl-Class-Gomor-vl.spec

@@ -1,6 +1,6 @@
 Name:           perl-Class-Gomor
 Summary:        Perl module that implements another class and object builder
-Version:        1.02
+Version:        1.03
 Release:        1%{?_dist_release}
 License:        Artistic or GPL+
 Group:          Development/Libraries
@@ -13,12 +13,16 @@ BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 %description
 Class-Gomor is a Perl module that implements another class and object builder.
 
 %prep
-%setup -n Class-Gomor-%{version}
+%setup -q -n Class-Gomor-%{version}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS="vendor"
@@ -46,5 +50,9 @@ find examples/ -type f -exec %{__chmod} a-x {} \;
 %{perl_vendorlib}/Class/Gomor.pm
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.03-1
+- updated to 1.03
+- built with perl 5.16.3
+
 * Mon Mar 05 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.02-1
 - initial build for Vine Linux

+ 11 - 3
p/perl-Data-Phrasebook-Loader-YAML/perl-Data-Phrasebook-Loader-YAML-vl.spec

@@ -2,9 +2,9 @@
 
 Summary:        Absract your phrases with YAML
 Name:           perl-%{real_name}
-Version:        0.09
+Version:        0.13
 Release:        1%{?_dist_release}
-License:        Artistic or GPL+
+License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Phrasebook-Loader-YAML/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Phrasebook-Loader-YAML-%{version}.tar.gz
@@ -16,6 +16,10 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Data::Phrasebook) >= 0.18
 BuildRequires:  perl(Test::More) >= 0.47
 BuildRequires:  perl(YAML) >= 0.35
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 %description
 Absract your phrases with YAML.
@@ -40,10 +44,14 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc Artistic COPYING Changes INSTALL LICENSE MANIFEST MANIFEST.SKIP META.yml README examples
+%doc Changes LICENSE MANIFEST MANIFEST.SKIP README examples
 %{_mandir}/man3/*
 %{perl_vendorlib}/*
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.13-1
+- updated to 0.13
+- built with perl 5.16.3
+
 * Tue Mar 13 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.09-1
 - initial build for Vine Linux

+ 9 - 1
p/perl-Net-MAC-Vendor/perl-Net-MAC-Vendor-vl.spec

@@ -1,6 +1,6 @@
 Name:           perl-Net-MAC-Vendor
 Summary:        Lookup the vendor for a MAC address
-Version:        1.18
+Version:        1.23
 Release:        1%{?_dist_release}
 License:        Artistic or GPL
 Group:          Development/Libraries
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 %description
 Lookup the vendor for a MAC address.
@@ -44,5 +48,9 @@ find examples/ -type f -exec %{__chmod} a-x {} \;
 %{perl_vendorlib}/Net/MAC/Vendor.pm
 
 %changelog
+* Sun Feb  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.23-1
+- updated to 1.23
+- built with perl 5.16.3
+
 * Mon Mar 05 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.18-1
 - initial build for Vine Linux