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

L/LibRaw/LibRaw-vl.spec

@@ -1,18 +1,16 @@
 Summary: Library for reading RAW files obtained from digital photo cameras
 Summary(ja): デジタルカメラから取り込んだ RAW ファイルを読むためのライブラリ
 Name: LibRaw
-Version: 0.11.3
-Release: 1%{?_dist_release}
+Version: 0.13.5
+Release: 2%{?_dist_release}
 License: LGPLv2 or CDDL or LibRaw Software License
 Group: System Environment/Libraries
 URL: http://www.libraw.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gcc libtool make
 
 Source0: http://www.libraw.org/data/LibRaw-%{version}.tar.gz
 
-# Configuration support. Patch sent upstream
-Patch0: %{name}-0.11.3-configure.patch
-
 %description
 LibRaw is a library for reading RAW files obtained from digital photo
 cameras (CRW/CR2, NEF, RAF, DNG, and others).
@@ -25,23 +23,33 @@ Summary: LibRaw development libraries
 Summary(ja): LibRaw の開発ライブラリ
 Group: Development/Libraries
 License: LGPLv2 or CDDL o LibRaw Software License
+
 %description devel
 LibRaw development libraries
 
 This package contains static libraries that applications can use to build
 against libraw. LibRaw does not provide dynamic libraries.
 
+%package static
+Summary: LibRaw static libraries
+Summary(ja): LibRaw の静的ライブラリ
+Group: Development/Libraries
+License: LGPLv2 or CDDL o LibRaw Software License
+
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+This package contains the static library for %{name}.
+
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .configure
-#%patch1 -p1 -b .configure-optflags
-#%patch2 -p1 -b .configure-default-cflags
-
 %build
 # This is not the autotools generated configure script
-CFLAGS="%{optflags}" sh configure -P %{_prefix}
-make %{?_smp_mflags} library
+CFLAGS="%{optflags}" sh configure --prefix=/usr --disable-examples \
+ --disable-demosaic-pack-gpl2 --disable-demosaic-pack-gpl3 \
+ --enable-static=no --enable-shared=no
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -51,21 +59,41 @@ cp -pr doc manual
 chmod 644 LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf
 
 # The Libraries
-make install-library DESTDIR=%{buildroot} LIBDIR=%{_lib}
+#make install DESTDIR=%{buildroot} LIBDIR=%{_lib}
+%makeinstall
+
+rm -rf %{buildroot}%{_libdir}/*.la
 
 %files devel
 %defattr(-,root,root,-)
 
-%doc LICENSE.CDDL LICENSE.LibRaw.pdf LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus
-%doc manual
-%doc samples
+%doc Changelog.rus
+%doc manual samples
 
+%{_docdir}/libraw/
 %dir %{_includedir}/libraw
 %{_includedir}/libraw/*.h
+%{_libdir}/pkgconfig/*.pc
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/libraw.a
 %{_libdir}/libraw_r.a
 
 %changelog
+* Sun Jun 05 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.13.5-2
+- added BuildRequires: gcc libtool make
+- fixed %%install
+- deleted library archive
+- fixed %%doc in -devel package
+
+* Sat Jun 04 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.13.5-1
+- new upstream release
+- dropt Patch0
+- fixed configure option
+- fixed %%files
+- splitted -static package
+
 * Mon Dec 13 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.11.3-1
 - new upstream release
 - added License: LibRaw Software License

s/shotwell/shotwell-vl.spec

@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.8.1
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        A photo organizer for the GNOME desktop
 Summary(ja):    GNOME デスクトップ向けの画像整理ソフト
 
@@ -11,13 +11,14 @@ License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
 Source0:        http://www.yorba.org/download/shotwell/0.8/shotwell-%{version}.tar.bz2
 # svn co svn://svn.yorba.org/shotwell/branches/shotwell-0.4, make dist
-Patch0:         workaround_desktop.patch
+#Patch0:         workaround_desktop.patch
 Patch1:         shotwell-0.8.1-vala.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  GConf2-devel
 BuildRequires:  LibRaw-devel
+BuildRequires:  LibRaw-static
 BuildRequires:  WebKit-gtk-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
@@ -117,6 +118,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jun 04 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.8.1-3
+- dropt Patch0
+- added BuildRequires: LibRaw-static
+
 * Sun Apr 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.8.1-2
 - add Patch1 (shotwell-0.8.1-vala.patch)