Accepting request 69986 from KDE:Distro:Factory

Spec file updates (forwarded request 69918 from adra)

OBS-URL: https://build.opensuse.org/request/show/69986
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=45

tellico.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May  9 18:53:58 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+  * Added libv4l-devel in BuildRequires: and enabled compilation with it
+   (support for using a webcam to scan barcodes).
+  * Removed bookcase Provides:/Obsoletes: (name change was done at 2004-09-20).
+  * Added suitable %post/%postun scripts for the mime file installed by the
+    package.
+  * Fixed locales removal if suse_version is not set.
+
 -------------------------------------------------------------------
 Mon Apr 11 10:02:06 UTC 2011 - wstephenson@novell.com
 

tellico.spec

@@ -38,15 +38,16 @@ BuildRequires:  libksane-devel
 BuildRequires:  libpoppler-qt4-devel
 BuildRequires:  libqimageblitz-devel
 BuildRequires:  libqjson-devel
+BuildRequires:  libv4l-devel
 BuildRequires:  libyaz-devel
 BuildRequires:  taglib-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
 Requires:       kdepim4-runtime
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 Recommends:     %{name}-lang = %{version}
-Provides:       bookcase
-Obsoletes:      bookcase
 %kde4_pimlibs_requires
 %kde4_runtime_requires
 
@@ -60,7 +61,7 @@ stamps, trading cards, comic books, and wines.
 %setup -q
 
 %build
-%cmake_kde4 -d build
+%cmake_kde4 "-DENABLE_WEBCAM=true" -d build
 %make_jobs
 
 %install
@@ -77,7 +78,7 @@ rm -r %{buildroot}/nogo
 
 %kde_post_install
 
-%if 0%{?suse_version} < 1120
+%if 0%{?suse_version} && 0%{?suse_version} < 1120
 mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/sv/common
 mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/en/common
 mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/fr/common
@@ -87,6 +88,12 @@ mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/pt_BR/common
 
 %fdupes -s %{buildroot}
 
+%post
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+
 %clean
 rm -rf %{buildroot}
 
@@ -95,7 +102,7 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING ChangeLog README tellico.lsm
 %{_kde4_bindir}/tellico
 %{_kde4_applicationsdir}/tellico.desktop
-%{_kde4_htmldir}/en/tellico/
+%doc %{_kde4_htmldir}/en/tellico/
 %{_kde4_iconsdir}/hicolor/*/apps/tellico.png
 %{_kde4_iconsdir}/hicolor/*/mimetypes/application-x-tellico.png
 %{_kde4_appsdir}/kconf_update/tellico*