dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-ucview-0.22.tar.gz

.gitignore

@@ -0,0 +1 @@
+ucview-0.31.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ucview
-# $Id$
-NAME := ucview
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-1b43c823624962bde3248ae493995750  ucview-0.22.tar.gz
+b36fd5c54cb200f9917abedd5469bb94  ucview-0.31.tar.gz

ucview-0.31-include.patch

@@ -0,0 +1,15 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for ucview >= 0.31 to fix broken
+include. Upstream is aware about the issue - and this should be fixed for the next
+release of ucview.
+
+--- ucview-0.31/src/ucview-window.h		2009-12-08 18:25:26.000000000 +0100
++++ ucview-0.31/src/ucview-window.h.include	2010-02-21 18:59:53.000000000 +0100
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
+-#include <ucview/ucview.h>
++#include <ucview.h>
+ 
+ #define UCVIEW_GCONF_DIR "/apps/ucview"
+ #define UCVIEW_PLUGIN_GCONF_DIR "plugins"

ucview.desktop

@@ -8,5 +8,5 @@ Exec=ucview
 TryExec=ucview
 Icon=ucview
 Terminal=false
-Categories=Application;AudioVideo;Video;
+Categories=AudioVideo;Video;X-AudioVideoCapture;
 StartupNotify=true

ucview.spec

@@ -1,16 +1,16 @@
 Summary:          Image and video capture application using unicap toolkit
 Name:             ucview
-Version:          0.22
+Version:          0.31
-Release:          3%{?dist}
+Release:          1%{?dist}
 License:          GPLv2+
 Group:            Applications/Multimedia
 URL:              http://www.unicap-imaging.org/
 Source0:          http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
 Source1:          %{name}.desktop
-BuildRequires:    intltool, /usr/bin/perl, perl(XML::Parser), gettext
+Patch0:           ucview-0.31-include.patch
-BuildRequires:    unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel
+BuildRequires:    intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-devel
-BuildRequires:    glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils
+BuildRequires:    libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel
-BuildRequires:    libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73
+BuildRequires:    desktop-file-utils, dbus-glib-devel >= 0.73
 Requires:         hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   GConf2, scrollkeeper
@@ -26,8 +26,18 @@ By using unicap, it can access many different video capture devices
 like webcams, video grabber boards, IEEE-1394 (FireWire) cameras and
 others.
 
+%package devel
+Summary:          Development files for UCView
+Group:            Development/Libraries
+Requires:         %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The ucview-devel package includes header files necessary for building
+and developing programs and plugins which use UCView.
+
 %prep
 %setup -q
+%patch0 -p1 -b .include
 
 %build
 %configure --disable-schemas-install
@@ -42,11 +52,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 # Install a working ucview.desktop file
 desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
-# Don't install header files for ucview
+# Create plugin directory for ucview plugins
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{a,la}
 
 %find_lang %{name}
 
@@ -84,18 +91,40 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/dbus-1/services/*.service
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1*
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* Sat Feb 27 2010 Robert Scheck <robert@fedoraproject.org> 0.31-1
+- Upgrade to 0.31 (#530708)
+
+* Sat Oct 24 2009 Robert Scheck <robert@fedoraproject.org> 0.30-1
+- Upgrade to 0.30 (#530708)
+
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.23-4
+- Update desktop file according to F-12 FedoraStudio feature
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun May 24 2009 Robert Scheck <robert@fedoraproject.org> 0.23-2
+- Readded wrongly removed build requirement to dbus-glib-devel
+
+* Mon May 04 2009 Robert Scheck <robert@fedoraproject.org> 0.23-1
+- Upgrade to 0.23
+
 * Mon Feb 23 2009 Robert Scheck <robert@fedoraproject.org> 0.22-3
 - Rebuild against gcc 4.4 and rpm 4.6