rpms/ucview/devel ucview-0.31-include.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 ucview.spec, 1.11, 1.12

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/ucview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8621/devel

Modified Files:
	.cvsignore sources ucview.spec 
Added Files:
	ucview-0.31-include.patch 
Log Message:
Upgrade to 0.31 (#530708)


ucview-0.31-include.patch:
 ucview-window.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ucview-0.31-include.patch ---
Patch by Robert Scheck <robert at 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"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 May 2009 10:16:31 -0000	1.6
+++ .cvsignore	27 Feb 2010 00:58:50 -0000	1.7
@@ -1 +1 @@
-ucview-0.23.tar.gz
+ucview-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 May 2009 10:16:31 -0000	1.6
+++ sources	27 Feb 2010 00:58:50 -0000	1.7
@@ -1 +1 @@
-570a5d155b22529267a5a63eb95554ee  ucview-0.23.tar.gz
+b36fd5c54cb200f9917abedd5469bb94  ucview-0.31.tar.gz


Index: ucview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/devel/ucview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ucview.spec	27 Sep 2009 07:42:11 -0000	1.11
+++ ucview.spec	27 Feb 2010 00:58:50 -0000	1.12
@@ -1,16 +1,16 @@
 Summary:          Image and video capture application using unicap toolkit
 Name:             ucview
-Version:          0.23
-Release:          4%{?dist}
+Version:          0.31
+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
-BuildRequires:    unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel
-BuildRequires:    glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils
-BuildRequires:    libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73
+Patch0:           ucview-0.31-include.patch
+BuildRequires:    intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-devel
+BuildRequires:    libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel
+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 diff
 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_INST
 # Install a working ucview.desktop file
 desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
-# Don't install header files for ucview
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{a,la}
+# Create plugin directory for ucview plugins
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 %find_lang %{name}
 
@@ -84,7 +91,7 @@ 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}
@@ -94,7 +101,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_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 at fedoraproject.org> 0.31-1
+- Upgrade to 0.31 (#530708)
+
+* Sat Oct 24 2009 Robert Scheck <robert at 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