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

	* lensfun, libbsd: updated
	* util-linux: added compat32
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9323 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lensfun/lensfun-vl.spec

@@ -1,22 +1,34 @@
-
-# Fedora pkg-review: http://bugzilla.redhat.com/466764
+%global sse  -DBUILD_FOR_SSE:BOOL=OFF
+%global sse2 -DBUILD_FOR_SSE2:BOOL=OFF
+%ifarch x86_64
+%global sse  -DBUILD_FOR_SSE:BOOL=ON
+%global sse2 -DBUILD_FOR_SSE2:BOOL=ON
+%endif
 
 Name: lensfun
-Version: 0.2.5
-Summary: Library to rectify defects introduced by photographic lenses
+Version: 0.3.0
 Release: 1%{?_dist_release}
+Summary: Library to rectify defects introduced by photographic lenses
+
 License: LGPLv3 and CC-BY-SA
 Group: System Environment/Libraries
-URL: http://lensfun.berlios.de/
-Source0: http://download.berlios.de/lensfun/lensfun-%{version}.tar.bz2
-Patch0: lensfun-0.2.5-cpuid.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://lensfun.sourceforge.net/
+
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+
+## upstreamable patches
+# install manpages only when INSTALL_HELPER_SCRIPTS=ON
+Patch1: lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch
+# install manpages in the correct place
+Patch2: lensfun-0.3.0-mandir.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: cmake >= 2.8
 BuildRequires: doxygen
 BuildRequires: glib2-devel
 BuildRequires: libpng-devel
 BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python-docutils
 BuildRequires: zlib-devel
 
 Distribution: Vine Linux
@@ -44,36 +56,34 @@ using lensfun.
 
 %prep
 %setup -q 
-%patch0 -p1 -b .cpuid
+%patch1 -p1 -b .INSTALL_HELPER_SCRIPTS
+%patch2 -p1 -b .mandir
 
 
 %build
-# We can't use macro configure
-./configure \
-  --cflags="${CFLAGS:-%optflags}" \
-  --cxxflags="${CXXFLAGS:-%optflags}" \
-  --prefix=%{_prefix} \
-  --bindir=%{_bindir} \
-  --sysconfdir=%{_sysconfdir} \
-  --datadir=%{_datadir}/lensfun \
-  --libdir=%{_libdir} \
-  --includedir=%{_includedir} \
-  --libexecdir=%{_libexecdir} \
-%ifnarch %{ix86} x86_64
-  --vectorization \
-%endif
-  --target=..generic
-
-# set GCC.LDFLAGS to avoid stripping and useless -debuginfo
-make AUTODEP=0 %{?_smp_mflags} lensfun manual \
-  V=1 \
-  GCC.LDFLAGS.release=""
-
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+    -DBUILD_DOC:BOOL=ON \
+    -DBUILD_TESTS:BOOL=OFF \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    %{?sse} %{?sse2} \
+    ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+make doc -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-make AUTODEP=0 INSTALL_PREFIX=%{buildroot} install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+## unpackaged files
+# omit cmake-installed doxygen docs, we handle that manually
+rm -rfv %{buildroot}%{_docdir}/%{name}-%{version}*
+# omit g-lensfun-update-data because it needs gksudo which we don't ship
+rm -fv %{buildroot}%{_bindir}/g-lensfun-update-data \
+    %{buildroot}%{_mandir}/man1/g-lensfun-update-data.*
 
 %clean
 rm -rf %{buildroot}
@@ -86,24 +96,27 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/*.txt
-# currently, nothing is covered by GPLv3 (no apps in the package), no need to
-# confuse people:
-%exclude %{_docdir}/%{name}-%{version}/gpl-3.0.txt
-%{_datadir}/lensfun/
+%doc README
+%doc docs/cc-by-sa-3.0.txt docs/lgpl-3.0.txt
+%doc docs/adobe-lens-profile.txt 
+%{_bindir}/*
 %{_libdir}/liblensfun.so.0*
+%{_datadir}/lensfun/
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/manual/
-%{_includedir}/lensfun.h
+%doc %{_target_platform}/doc_doxygen/*
+%{_includedir}/lensfun/
 %{_libdir}/liblensfun.so
 %{_libdir}/pkgconfig/lensfun.pc
 
 
 %changelog
+* Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.3.0-1
+- new upstream release
+- added BR: cmake
+
 * Sun Sep  4 2011 IWAI, Masaharu <iwai@alib.jp> 0.2.5-1
 - build for Vine Linux: based Fedora 0.2.5-5
 

lib/libb/libbsd/libbsd-vl.spec

@@ -1,17 +1,19 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Name:		libbsd
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?_dist_release}
 Summary:	Library providing BSD-compatible functions for portability
-URL:		http://libbsd.freedesktop.org/
-
-Source0:	http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
 
 License:	BSD and ISC and Copyright only and Public Domain
 Group:		System Environment/Libraries
+URL:		http://libbsd.freedesktop.org/
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+Source0:	http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       tomop
 
 %description
 libbsd provides useful functions commonly found on BSD systems, and
@@ -28,6 +30,30 @@ Requires:	pkgconfig
 %description devel
 Development files for the libbsd library.
 
+# compat32
+%package -n compat32-%{name}
+Summary:	Library providing BSD-compatible functions for portability
+Group:          System Environment/Libraries
+Requires:	libbsd = %{version}-%{release}
+
+%description -n compat32-%{name}
+libbsd provides useful functions commonly found on BSD systems, and
+lacking on others like GNU systems, thus making it easier to port
+projects with strong BSD origins, without needing to embed the same
+code over and over again on each project.
+
+
+%package -n compat32-%{name}-devel
+Summary:	Development files for libbsd
+Group:          Development/Libraries
+Requires:       compat32-%{name} = %{version}-%{release}
+Requires:	compat32-pkgconfig
+Requires:       %{name}-devel = %{version}-%{release}
+
+%description -n compat32-%{name}-devel
+Development files for the libbsd library.
+
+
 %prep
 %setup -q
 
@@ -46,6 +72,7 @@ make CFLAGS="%{optflags}" %{?_smp_mflags} \
      exec_prefix=%{_prefix}
 
 %install
+rm -rf %{buildroot}
 make libdir=%{_libdir} \
      usrlibdir=%{_libdir} \
      exec_prefix=%{_prefix} \
@@ -53,14 +80,21 @@ make libdir=%{_libdir} \
      install
 
 # don't want static library
-rm -f %{buildroot}%{_libdir}/%{name}.a
-rm -f %{buildroot}%{_libdir}/%{name}.la
+rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/lib*.la
 
-%post
-/sbin/ldconfig
+%clean
+rm -rf %{buildroot}
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%if %{build_compat32}
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
 
 %files
 %doc COPYING README TODO ChangeLog
@@ -72,9 +106,29 @@ rm -f %{buildroot}%{_libdir}/%{name}.la
 %{_includedir}/bsd
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}-ctor.pc
+%{_libdir}/pkgconfig/%{name}-overlay.pc
+
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root)
+%{_libdir}/%{name}.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root)
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}-ctor.pc
 %{_libdir}/pkgconfig/%{name}-overlay.pc
+%endif
+
 
 %changelog
+* Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.7.0-1
+- new upstream release.
+- added compat32 subpackages
+
 * Sun Jan 12 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.6.0-1
 - new upstream release.
 

u/util-linux/util-linux-vl.spec

@@ -3,7 +3,7 @@ Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
 Version: 2.22.2
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -296,15 +296,41 @@ Summary: Development files for device mounting library
 Summary(ja): デバイスマウントライブラリの開発用ファイル
 Group: Development/Libraries
 License: LGPLv2+
-Requires: libmount = %{version}-%{release}
+Requires: libmount-devel = %{version}-%{release}
 Requires: compat32-libmount = %{version}-%{release}
-Requires: pkgconfig
+Requires: compat32-pkgconfig
 
 %description -n compat32-libmount-devel
 This is the device mounting development library and headers,
 part of util-linux.
 
 
+%package -n compat32-libblkid
+Summary: Block device ID library
+Summary(ja): ブロックデバイス識別ライブラリ
+Group: System Environment/Libraries
+License: LGPLv2+
+Requires: libblkid = %{version}-%{release}
+
+%description -n compat32-libblkid
+This is block device identification library, part of util-linux-ng.
+
+
+%package -n compat32-libblkid-devel
+Summary: Development files for block device ID library
+Summary(ja): ブロックデバイス識別ライブラリの開発用ファイル
+Group: Development/Libraries
+License: LGPLv2+
+Requires: libblkid-devel = %{version}-%{release}
+Requires: compat32-libblkid = %{version}-%{release}
+Requires: compat32-pkgconfig
+Provides: compat32-libblkid-static = %{version}-%{release}
+
+%description -n compat32-libblkid-devel
+This is the block device identification development library and headers,
+part of util-linux-ng.
+
+
 %package -n compat32-libuuid
 Summary: Universally unique ID library
 Summary(ja): UUID ライブラリ
@@ -330,7 +356,7 @@ Group: Development/Libraries
 License: BSD
 Requires: libuuid-devel = %{version}-%{release}
 Requires: compat32-libuuid = %{version}-%{release}
-Requires: pkgconfig
+Requires: compat32-pkgconfig
 
 %description -n compat32-libuuid-devel
 This is the universally unique ID development library and headers,
@@ -627,6 +653,9 @@ exit 0
 %post -n compat32-libuuid -p /sbin/ldconfig
 %postun -n compat32-libuuid -p /sbin/ldconfig
 
+%post -n compat32-libblkid -p /sbin/ldconfig
+%postun -n compat32-libblkid -p /sbin/ldconfig
+
 %post -n compat32-libmount -p /sbin/ldconfig
 %postun -n compat32-libmount -p /sbin/ldconfig
 
@@ -950,6 +979,16 @@ fi
 %{_libdir}/libuuid.so
 %{_libdir}/pkgconfig/uuid.pc
 
+%files -n compat32-libblkid
+%defattr(-,root,root)
+/%{_lib}/libblkid.so.*
+
+%files -n compat32-libblkid-devel
+%defattr(-,root,root)
+%{_libdir}/libblkid.a
+%{_libdir}/libblkid.so
+%{_libdir}/pkgconfig/blkid.pc
+
 %files -n compat32-libmount
 %defattr(-,root,root)
 /%{_lib}/libmount.so.*
@@ -962,6 +1001,9 @@ fi
 %endif
 
 %changelog
+* Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.22.2-4
+- added compat32-libblkid
+
 * Thu Oct  2 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.22.2-3
 - updated Summary
 - fixed %doc to include libmount COPYING