- updated to 1.3

- merged parts from DEVEL
- new webcam bcond for built-in barcode recognition
- rel. 1

Changed files:
    tellico.spec -> 1.50

diff --git a/tellico.spec b/tellico.spec
index 7fb881450f1bfd7560c31d908ae4ce77adbc47be..19802db5e34fe04d05c819c9052677f8059a685c 100644 (file)
--- a/tellico.spec
+++ b/tellico.spec
@@ -1,15 +1,21 @@
+#
+# Conditional build:
+%bcond_with    webcam  # build with webcam barcode recognition
+#
 Summary:       A collection manager
 Summary(pl.UTF-8):     Zarządca zbiorów wideo, audio i książek
 Name:          tellico
-Version:       1.2.14
-Release:       2
+Version:       1.3
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-# Source0-md5: 38047e27d482757fae977fa49809a784
+# Source0-md5: e14286bc16a639a4e956edee4f1a9100
+Patch0:                %{name}-u64.patch
 URL:           http://www.periapsis.org/tellico/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: exempi-devel
 BuildRequires: kdelibs-devel >= 9:3.3.1
 BuildRequires: kdemultimedia-devel
 BuildRequires: kdepim-devel
@@ -17,6 +23,7 @@ BuildRequires:        libtool
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-progs
 BuildRequires: libxslt-devel >= 1.0.19
+BuildRequires: poppler-qt-devel
 BuildRequires: rpmbuild(macros) >= 1.129
 BuildRequires: taglib-devel
 BuildRequires: yaz-devel
@@ -35,7 +42,8 @@ Tellico to osobista aplikacja katalogowa przeznaczona do
 księgozbiorów, archiwów wideo i audio.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -47,6 +55,7 @@ cp -f /usr/share/automake/config.sub admin
 %{__perl} admin/am_edit
 %configure \
        --enable-final \
+       %{?with_webcam:--enable-webcam} \
        --with-qt-libraries=%{_libdir}
 
 %{__make}
@@ -69,9 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database_post
+%update_mime_database
 
 %postun
 %update_desktop_database_postun
+%update_mime_database
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -80,8 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mimelnk/application/x-%{name}.desktop
 %{_datadir}/apps/kconf_update/%{name}-rename.upd
 %{_datadir}/apps/kconf_update/tellico.upd
+%{_datadir}/apps/kconf_update/tellico-1-3-update.pl
 %{_datadir}/apps/%{name}
 %{_datadir}/config/tellicorc
 %{_datadir}/config.kcfg/tellico_config.kcfg
+%{_datadir}/mime/packages/*.xml
 %{_desktopdir}/kde/%{name}.desktop
-%{_iconsdir}/*/*/*/%{name}.png
+%{_iconsdir}/*/*/*/*.png