[svn] r4850 - in trunk: rpms rpms/gocr rpms/ogmrip web/freshrpms.net/packages/lists

Mon Oct 23 14:48:21 CEST 2006

Author: thias
Date: 2006-10-23 14:48:20 +0200 (Mon, 23 Oct 2006)
New Revision: 4850

Added:
   trunk/rpms/gocr/gocr-0.41-pgm.patch
   trunk/rpms/ogmrip/
   trunk/rpms/ogmrip/ogmrip.spec
Modified:
   trunk/rpms/gocr/gocr.spec
   trunk/web/freshrpms.net/packages/lists/fc6.txt
Log:
Initial package of ogmrip 0.10.0 and update gocr to 0.41.


Added: trunk/rpms/gocr/gocr-0.41-pgm.patch
===================================================================

--- trunk/rpms/gocr/gocr-0.41-pgm.patch	                        (rev 0)
+++ trunk/rpms/gocr/gocr-0.41-pgm.patch	2006-10-23 12:48:20 UTC (rev 4850)
@@ -0,0 +1,24 @@
+--- src/pnm.c	2006-08-23 00:33:58.000000000 +0200
++++ src/pnm.c.new	2006-09-01 01:15:48.000000000 +0200
+@@ -280,7 +280,7 @@
+   pic=(unsigned char *)malloc( nx*ny );
+   if(pic==NULL)F0("memory failed");			// no memory
+   /* this is a slow but short routine for P1 to P6 formats */
+-  if( c2=='5' && c2=='2' ) /* slow PGM-RAW/ASC read pixelwise */
++  if( c2=='5' || c2=='2' ) /* slow PGM-RAW/ASC read pixelwise */
+     for (i=0;i<nx*ny;i++) {
+      if (c2=='5') { if(bps!=(int)fread(buf,1,bps,f1))F0("read"); }
+      else for (j=0;j<3;j++) fread_num(buf+j*bps, bps, f1);
+@@ -292,9 +292,9 @@
+       if (c2=='6') { if (3*bps!=(int)fread(buf,1,3*bps,f1)) F0("read"); }
+       else for (j=0;j<3;j++) fread_num(buf+j*bps, bps, f1);
+       pic[i]
+-          = ((PPM_RED_WEIGHT   * buf[  bps-1] + 511)>>10)
+-          + ((PPM_GREEN_WEIGHT * buf[2*bps-1] + 511)>>10)
+-          + ((PPM_BLUE_WEIGHT  * buf[3*bps-1] + 511)>>10);
++          = ((PPM_RED_WEIGHT   * (unsigned char)buf[  bps-1] + 511)>>10)
++          + ((PPM_GREEN_WEIGHT * (unsigned char)buf[2*bps-1] + 511)>>10)
++          + ((PPM_BLUE_WEIGHT  * (unsigned char)buf[3*bps-1] + 511)>>10);
+       /* normalized to 0..255 */
+     }
+   }

Modified: trunk/rpms/gocr/gocr.spec
===================================================================
--- trunk/rpms/gocr/gocr.spec	2006-10-23 11:19:12 UTC (rev 4849)
+++ trunk/rpms/gocr/gocr.spec	2006-10-23 12:48:20 UTC (rev 4850)
@@ -1,16 +1,16 @@
 # $Id$
-
 # Authority: dag
 
 Summary: Optical Character Recognition (OCR) program
 Name: gocr
-Version: 0.37
-Release: 0.2
+Version: 0.41
+Release: 1
 License: GPL
 Group: Applications/Multimedia
-URL: http://altmark.nat.uni-magdeburg.de/~jschulen/ocr/
+URL: http://jocr.sourceforge.net/
 
 Source: http://dl.sf.net/jocr/gocr-%{version}.tar.gz
+Patch0: http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.41-pgm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk+-devel >= 1.2.8, netpbm-devel
@@ -40,18 +40,21 @@
 
 %prep
 %setup
+%patch0 -p0 -b .pgm
+# Create mkinstalldirs -> gnome/mkinstalldirs in frontend directory
 %{__ln_s} -f gnome/mkinstalldirs frontend/mkinstalldirs
 
 %build
 # needed for configure
-export CFLAGS=-lm
+#export CFLAGS=-lm
 %configure
-%{__perl} -pi -e 's|^LDFLAGS=|LDFLAGS=-lm |g;' Makefile */Makefile
+#%{__perl} -pi -e 's|^LDFLAGS=|LDFLAGS=-lm |g;' Makefile */Makefile
 %{__make} %{?_smp_mflags}
 
 cd frontend/gnome
 %configure
 %{__make} %{?_smp_mflags}
+cd ../..
 
 %install
 %{__rm} -rf %{buildroot}
@@ -64,14 +67,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS BUGS CREDITS HISTORY README REMARK.txt REVIEW TODO
-%doc doc/*.html doc/*.txt
-%doc %{_mandir}/man?/*
+%doc doc/*.html
 %{_bindir}/gocr
+%{_bindir}/gocr.tcl
+%{_mandir}/man1/gocr.1*
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc api/doc/*.tex api/doc/*.txt
-%doc AUTHORS
+%doc api/doc/*.txt
 %{_libdir}/*.a
 %{_includedir}/gocr.h
 
@@ -81,8 +84,14 @@
 %{_bindir}/gtk-ocr
 
 %changelog
+* Mon Oct 23 2006 Matthias Saou <http://freshrpms.net/> 0.41-1
+- Update to 0.41.
+- Remove (apparently) no longer needed libm hack.
+- Include user and devel docs only once, in one format.
+
 * Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.37-0.2
 - Rebuild for Fedora Core 5.
 
 * Sun May 11 2003 Dag Wieers <dag at wieers.com> - 0.37-0
 - Initial package. (using DAR)
+

Added: trunk/rpms/ogmrip/ogmrip.spec
===================================================================
--- trunk/rpms/ogmrip/ogmrip.spec	                        (rev 0)
+++ trunk/rpms/ogmrip/ogmrip.spec	2006-10-23 12:48:20 UTC (rev 4850)
@@ -0,0 +1,105 @@
+# $Id$
+# Authority: matthias
+
+Summary: DVD ripping and encoding graphical user interface
+Name: ogmrip
+Version: 0.10.0
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://ogmrip.sourceforge.net/
+Source: http://dl.sf.net/ogmrip/ogmrip-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: mplayer, mencoder
+BuildRequires: gtk2-devel, libglade2-devel, GConf2-devel, libxml2-devel
+Buildrequires: hal-devel, dbus-glib-devel, enchant-devel
+Buildrequires: libdvdread-devel, libtheora-devel, libvorbis-devel, gocr-devel
+Buildrequires: gettext-devel, intltool
+# Not technically build required, but configure checks for it...
+Buildrequires: mplayer, mencoder, ogmtools, vorbis-tools, theora-tools
+BuildRequires: mkvtoolnix
+# Now, all the same as runtime requirements
+Requires: mplayer, mencoder, ogmtools, vorbis-tools, theora-tools
+Requires: mkvtoolnix
+# We should normally provide the built srttool program, but it conflicts
+Requires: subtitleripper
+Requires(post): GConf2
+Requires(postun): GConf2
+
+%description
+OGMRip is an application and a set of libraries for ripping and encoding DVDs
+into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It relies
+on mplayer, mencoder, ogmtools, mkvtoolnix, oggenc, lame and faac to perform
+its tasks.
+
+
+%package devel
+Summary: Development files for ogmrip
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development headers and libraries for ogmrip.
+
+
+%prep
+%setup
+# Remove -Werror since build fails because of warn_unused_result otherwise
+%{__perl} -pi -e 's|-Wall -Werror|-Wall|g' configure*
+
+
+%build
+%configure --disable-static
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall
+%find_lang %{name}
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+    %{_sysconfdir}/gconf/schemas/ogmrip.schemas &>/dev/null || :
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/ogmrip.schemas &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%{_sysconfdir}/gconf/schemas/ogmrip.schemas
+%{_bindir}/dvdcpy
+%{_bindir}/ogmrip
+# This file conflicts with subtitleripper
+%exclude %{_bindir}/srttool
+%{_bindir}/subp2pgm
+%{_bindir}/theoraenc
+%{_libdir}/*.so.*
+%{_datadir}/applications/ogmrip.desktop
+%{_datadir}/ogmrip/
+%{_datadir}/pixmaps/ogmrip.png
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/*
+%exclude %{_libdir}/*.la
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+
+
+%changelog
+* Mon Oct 23 2006 Matthias Saou <http://freshrpms.net/> 0.10.0-1
+- Initial RPM release.
+


Property changes on: trunk/rpms/ogmrip/ogmrip.spec
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/web/freshrpms.net/packages/lists/fc6.txt
===================================================================
--- trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-23 11:19:12 UTC (rev 4849)
+++ trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-23 12:48:20 UTC (rev 4850)
@@ -57,6 +57,7 @@
 gaim-encryption x (since last gaim update)
 glame x (undefined reference to GLAME_NEWCELL)
 gnuboy
+gocr
 libdvdnav *
 libdvdcss *
 libdvdread *
@@ -99,6 +100,7 @@
 nvidia-x11-drv O
 ogle
 ogle_gui
+ogmrip
 ogmtools
 php-pear-excel o x (pear missing)
 php-pear-ole o x (pear missing)

