[svn] r5271 - in trunk/rpms: csockets fbreader libease

[packagers at lists.rpmforge.net]

Author: dries
Date: 2007-04-16 12:48:32 +0200 (Mon, 16 Apr 2007)
New Revision: 5271

Modified:
   trunk/rpms/csockets/csockets.spec
   trunk/rpms/fbreader/fbreader.spec
   trunk/rpms/libease/libease.spec
Log:
updates

Modified: trunk/rpms/csockets/csockets.spec
===================================================================
--- trunk/rpms/csockets/csockets.spec	2007-04-16 08:40:52 UTC (rev 5270)
+++ trunk/rpms/csockets/csockets.spec	2007-04-16 10:48:32 UTC (rev 5271)
@@ -3,7 +3,7 @@
 
 Summary: C++ wrapper for sockets
 Name: csockets
-Version: 2.1
+Version: 2.1.1
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Apr 16 2007 Dries Verachtert <dries at ulyssis.org> - 2.1.1-1
+- Updated to release 2.1.1.
+
 * Sun Nov 12 2006 Dries Verachtert <dries at ulyssis.org> - 2.1-1
 - Updated to release 2.1.
 

Modified: trunk/rpms/fbreader/fbreader.spec
===================================================================
--- trunk/rpms/fbreader/fbreader.spec	2007-04-16 08:40:52 UTC (rev 5270)
+++ trunk/rpms/fbreader/fbreader.spec	2007-04-16 10:48:32 UTC (rev 5271)
@@ -6,14 +6,13 @@
 
 Summary: E-book reader
 Name: fbreader
-Version: 0.7.4
+Version: 0.8.2
 Release: 1
 License: GPL
 Group: Applications/Multimedia
 URL: http://only.mawhrin.net/fbreader/
 
 Source: http://only.mawhrin.net/fbreader/fbreader-sources-%{version}.tgz
-Patch: gcc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: enca-devel, qt-devel >= 3.2, kdelibs-devel, gcc-c++
@@ -21,36 +20,18 @@
 %description
 FBReader is an e-book reader for Linux PDAs and desktop computers.
 FBReader supports several e-book formats: plucker, palmdoc, zTXT, 
-HTML, fb2, and plain text.  
+HTML, fb2, and plain text.
 
 %prep
 %setup
-%patch -p1
 
-%{__cat} <<EOF >fbreader.desktop
-[Desktop Entry]
-Name=FBReader
-Comment=Read various ebook formats
-Exec=FBReader
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Application;AudioVideo;
-EOF
-
 %build
-%{__make} %{?_smp_mflags} EXTERNALINCLUDE=-I${QTDIR}/include MOC=moc UILIBS="-L${QTDIR}/lib -lqt-mt" INSTALLDIR=%{_prefix}
+%{__make} %{?_smp_mflags} EXTERNALINCLUDE=-I${QTDIR}/include MOC=moc UILIBS="-L${QTDIR}/lib -lqt-mt" INSTALLDIR=%{_prefix} TARGET_ARCH=desktop UI_TYPE=qt LIBDIR=%{_libdir}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall EXTERNALINCLUDE=-I${QTDIR}/include MOC=moc UILIBS="-L${QTDIR}/lib -lqt-mt" INSTALLDIR=%{_prefix} DESTDIR=%{buildroot}
+%makeinstall EXTERNALINCLUDE=-I${QTDIR}/include MOC=moc UILIBS="-L${QTDIR}/lib -lqt-mt" INSTALLDIR=%{_prefix} DESTDIR=%{buildroot} TARGET_ARCH=desktop UI_TYPE=qt LIBDIR=%{_libdir}
 
-%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
-desktop-file-install --vendor %{desktop_vendor}    \
-	--add-category X-Red-Hat-Base              \
-	--dir %{buildroot}%{_datadir}/applications \
-	fbreader.desktop
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -58,9 +39,16 @@
 %defattr(-, root, root, 0755)
 %{_bindir}/FBReader
 %{_datadir}/FBReader/
-%{_datadir}/applications/%{desktop_vendor}-fbreader.desktop
+%{_libdir}/libzlibrary-qt.so.*
+%{_datadir}/applications/FBReader.desktop
+%{_datadir}/pixmaps/FBReader.png
+%{_datadir}/pixmaps/FBReader/
+%{_datadir}/zlibrary/
 
 %changelog
+* Mon Apr 16 2007 Dries Verachtert <dries at ulyssis.org> - 0.8.2-1
+- Updated to release 0.8.2.
+
 * Fri May 26 2006 Dries Verachtert <dries at ulyssis.org> - 0.7.4-1
 - Updated to release 0.7.4.
 

Modified: trunk/rpms/libease/libease.spec
===================================================================
--- trunk/rpms/libease/libease.spec	2007-04-16 08:40:52 UTC (rev 5270)
+++ trunk/rpms/libease/libease.spec	2007-04-16 10:48:32 UTC (rev 5271)
@@ -4,13 +4,13 @@
 
 Summary: Easing algorithms for graphical effects and mathematical calculations
 Name: libease
-Version: 0.0.2
+Version: 0.0.3
 Release: 1
 License: GPL
 Group: Development/Libraries
 URL: http://libease.sourceforge.net/
 
-Source: http://dl.sf.net/libease/libease-%{version}.tar.bz2
+Source: http://dl.sf.net/libease/libease-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 #BuildRequires:
@@ -32,7 +32,7 @@
 you will need to install %{name}-devel.
 
 %prep
-%setup -n libease
+%setup
 %{__perl} -pi -e "s|.*ldconfig.*||g;" Makefile
 %{__perl} -pi -e "s|ln -s (.*)/libease(.*) (.*)/libease.so|ln -s %{_libdir}/libease\$2 \${3}/libease.so|g;" Makefile
 
@@ -42,7 +42,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d %{buildroot}%{_includedir} %{buildroot}%{_bindir} %{buildroot}%{_libdir} %{buildroot}%{_mandir}/man3
-%{__make} all install PREFIX=%{buildroot}%{_prefix}
+%{__make} all install PREFIX=%{buildroot}%{_prefix} LIBPATH=%{buildroot}%{_libdir}
 
 %post
 /sbin/ldconfig 2>/dev/null
@@ -65,6 +65,9 @@
 %{_libdir}/libease.so
 
 %changelog
+* Mon Apr 16 2007 Dries Verachtert <dries at ulyssis.org> - 0.0.3-1
+- Updated to release 0.0.3.
+
 * Fri Apr 28 2006 Dries Verachtert <dries at ulyssis.org> - 0.0.2-1
 - Updated to release 0.0.2.