[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/pan/devel pan-0.14.2.91-gcc4-2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pan.spec, 1.1, 1.2 sources, 1.2, 1.3 pan-0.14.2-gcc34.patch, 1.1, NONE pan-0.14.2-gmime-crash-120007.patch, 1.1, NONE pan-desktop-rh-119909.patch, 1.1, NONE



Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13562/devel

Modified Files:
	.cvsignore pan.spec sources 
Added Files:
	pan-0.14.2.91-gcc4-2.patch 
Removed Files:
	pan-0.14.2-gcc34.patch pan-0.14.2-gmime-crash-120007.patch 
	pan-desktop-rh-119909.patch 
Log Message:
auto-import pan-0.14.2.91-2 on branch devel from pan-0.14.2.91-2.src.rpm

pan-0.14.2.91-gcc4-2.patch:

--- NEW FILE pan-0.14.2.91-gcc4-2.patch ---
--- pan-0.14.2.91/pan/base/msort.c.orig	2005-04-25 15:54:31.000000000 +0000
+++ pan-0.14.2.91/pan/base/msort.c	2005-04-25 15:59:21.000000000 +0000
@@ -65,14 +65,16 @@
 			if ((*cmp) (b1, b2) <= 0)
 			{
 				--n1;
-				*((unsigned long int *) tmp)++ =
-					*((unsigned long int *) b1)++;
+				*((unsigned long int *) tmp) = *((unsigned long int *) b1);
+				tmp += sizeof(unsigned long int);
+				b1 += sizeof(unsigned long int);
 			}
 			else
 			{
 				--n2;
-				*((unsigned long int *) tmp)++ =
-					*((unsigned long int *) b2)++;
+				*((unsigned long int *) tmp) = *((unsigned long int *) b2);
+				tmp += sizeof(unsigned long int);
+				b2 += sizeof(unsigned long int);
 			}
 		}
 	else


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jun 2005 18:36:10 -0000	1.2
+++ .cvsignore	21 Jun 2005 19:44:17 -0000	1.3
@@ -1,2 +1 @@
-gnet-2.0.4.tar.gz
-pan-0.14.2.tar.bz2
+pan-0.14.2.91.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pan.spec	21 Jun 2005 18:36:10 -0000	1.1
+++ pan.spec	21 Jun 2005 19:44:17 -0000	1.2
@@ -1,26 +1,27 @@
-%define gnet_vers 2.0.4
-
-Summary: A GNOME/GTK+ news reader for X.
+Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.14.2
-Release: 8
+Version: 0.14.2.91
+Release: 2%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
-Source: http://pan.rebelbase.com/download/%{version}/%{name}-%{version}.tar.bz2
+Source0: http://pan.rebelbase.com/download/%{version}/%{name}-%{version}.tar.bz2
 #Source1: net-pan.desktop
-Source2: http://www.gnetlibrary.org/src/gnet-%{gnet_vers}.tar.gz
+#Source2: http://www.gnetlibrary.org/src/gnet-%{gnet_vers}.tar.gz
 #Patch5: pan-0.12.1-browser.patch
 Patch7: pan-0.14.0-default-editor-80839.patch
 # disabled (see below)
-Patch8: pan-0.14.2-gcc34.patch
-Patch9: pan-0.14.2-gmime-crash-120007.patch
-Patch10: pan-desktop-rh-119909.patch
+#Patch8: pan-0.14.2-gcc34.patch
+#Patch9: pan-0.14.2-gmime-crash-120007.patch
+#Patch10: pan-desktop-rh-119909.patch
+Patch11: pan-0.14.2.91-gcc4-2.patch
 URL: http://pan.rebelbase.com/
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel glib2-devel gtkspell-devel aspell-devel
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
-Requires: gtk2 glib2 gtkspell libxml2 >= 2.4.22
+BuildRequires: gnet2-devel >= 2.0.4
+BuildRequires: desktop-file-utils
+BuildRequires: pcre-devel >= 4.0
+BuildRequires: gtkspell-devel >= 2.0.2
 
 %description
 Pan is a newsreader which attempts to be pleasant to new and
@@ -33,50 +34,59 @@
 evaluations.
 
 %prep
-%setup -q -a2
+%setup -q
 #%%patch5 -p1 -b .browser
 %patch7 -p1 -b .editor
 # this patch breaks pan (see bug 121103)
 ## gcc-3.4 fix
 #%%patch8 -p1 -b .gcc34
 # fix gmime crash
-%patch9 -p0 -b .crash
+#%patch9 -p0 -b .crash
 # add rh defs to upstream desktop file
-%patch10 -p1 -b .rh
+#%patch10 -p1 -b .rh
+%patch11 -p1 -b .gcc4
+echo "StartupNotify=true" >> pan.desktop.in
+
 
 %build
-( cd gnet-%{gnet_vers}
-  ./configure --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} --disable-shared --enable-glib2
-  rm -rf %{buildroot}
-  %makeinstall )
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-%configure --enable-gtkspell --with-gnet-exec-prefix=%{buildroot}%{_prefix}
+%configure --enable-gtkspell
 make
 
 %install
 rm -rf %buildroot
-%makeinstall
-%find_lang %name
+make DESTDIR=%buildroot install
 
-# move desktop file into right place
-mkdir -p %{buildroot}%{_datadir}/applications
-mv %{buildroot}%{_datadir}/gnome/apps/Internet/pan.desktop %{buildroot}%{_datadir}/applications/net-pan.desktop
-rmdir %{buildroot}%{_datadir}/gnome/apps/Internet/
-echo "OnlyShowIn=GNOME;" >> %{buildroot}%{_datadir}/applications/net-pan.desktop
+install -d $RPM_BUILD_ROOT%_datadir/applications
+desktop-file-install $RPM_BUILD_ROOT%_datadir/gnome/apps/Internet/%{name}.desktop \
+--vendor=fedora \
+--add-category=Application \
+--add-category=Network \
+--add-category=X-Fedora \
+--dir=$RPM_BUILD_ROOT%_datadir/applications \
+--copy-name-to-generic-name \
+--delete-original
+
+%find_lang %name
 
 %clean
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING CREDITS ChangeLog README TODO
+%doc AUTHORS COPYING CREDITS ChangeLog README TODO ANNOUNCE.html
 %{_bindir}/pan
 %{_datadir}/pixmaps/*
-%{_datadir}/applications/net-pan.desktop
+%{_datadir}/applications/fedora-pan.desktop
 
 %changelog
-* Tue Jun 15 2004 Elliot Lee <sopwith redhat com>
-- rebuilt
+* Tue Jun 21 2005 Michael A. Peters <mpeters mac com> 1:0.14.2.91-2
+- bump version
+- remove patch 8 - replace w/ gcc4 patch (patch11)
+- remove patch 9 - fixed in upstream version bump
+- remove patch 10 - fixed in upstream / use desktop-file-install
+- remove gnet2 source - use gnet2-devel from Extras
+- remove redundant BuildRequires, remove explicit library requires
+
 
 * Thu May 06 2004 Than Ngo <than redhat com> 1:0.14.2-7
 - cleanup GNOME/KDE Menu


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jun 2005 18:36:10 -0000	1.2
+++ sources	21 Jun 2005 19:44:17 -0000	1.3
@@ -1,2 +1 @@
-b43e728391143214e2cfd0b835b6fd2a  gnet-2.0.4.tar.gz
-ed3188e7059bb6d6c209ee5d46ac1852  pan-0.14.2.tar.bz2
+4770d899a1c1ba968ce96bc5aeb07b62  pan-0.14.2.91.tar.bz2


--- pan-0.14.2-gcc34.patch DELETED ---


--- pan-0.14.2-gmime-crash-120007.patch DELETED ---


--- pan-desktop-rh-119909.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]