rpms/tastymenu/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tastymenu.spec, 1.3, 1.4

[Kelly Miller (nixaff4)]

Author: nixaff4

Update of /cvs/extras/rpms/tastymenu/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27695/F-8

Modified Files:
	.cvsignore sources tastymenu.spec 
Log Message:
Updated Tastymenu to version 1.0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tastymenu/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 May 2007 20:27:01 -0000	1.3
+++ .cvsignore	22 Feb 2008 22:38:25 -0000	1.4
@@ -1 +1 @@
-tastymenu-0.8.2.tar.bz2
+tastymenu-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tastymenu/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 May 2007 20:27:01 -0000	1.3
+++ sources	22 Feb 2008 22:38:25 -0000	1.4
@@ -1 +1 @@
-5b3803cdaa137bce9c4e51ba66a27bd6  tastymenu-0.8.2.tar.bz2
+eebc0639811a6b96fccdd6e54623a47c  tastymenu-1.0.6.tar.bz2


Index: tastymenu.spec
===================================================================
RCS file: /cvs/extras/rpms/tastymenu/F-8/tastymenu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tastymenu.spec	2 Aug 2007 21:06:45 -0000	1.3
+++ tastymenu.spec	22 Feb 2008 22:38:25 -0000	1.4
@@ -1,16 +1,23 @@
 Name:           tastymenu
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        KMenu replacement
 
 Group:          User Interface/Desktops
 License:        LGPLv2+
 URL:            http://www.notmart.org/
-Source0:        http://www.notmart.org/files/tastymenu-0.8.2.tar.bz2
+Source0:        http://www.notmart.org/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel >= 3.0.0, gettext
+BuildRequires:  gettext
+
+%if 0%{?fedora} <= 8
+BuildRequires:  kdelibs-devel, kdebase-devel
 Requires:       kdebase
+%else
+BuildRequires:  kdelibs3-devel, kdebase3-devel
+Requires:       kdebase3
+%endif
 
 
 %description
@@ -22,34 +29,42 @@
 %prep
 %setup -q
 # Avoid lib64 rpaths
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+#%{__sed} -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
 
 %build
-%configure --disable-rpath --libdir=%{_libdir}/kde3 \
+%configure --disable-rpath \
    --enable-new-ldflags \
    --enable-final
 
 # do not link against libgcc_s and libm
-sed -i -e 's|"-lstdc++ -lm -lgcc_s -lc -lgcc_s|"-lstdc++ -lc|' libtool
+#%{__sed} -i -e 's|"-lstdc++ -lm -lgcc_s -lc -lgcc_s|"-lstdc++ -lc|' libtool
 
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
 # Fix the symlink problem
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
-ln -sf ../common
-popd
+#pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
+#ln -sf ../common
+#popd
+
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+
+
+#%post -p /sbin/ldconfig
+
+
+#%postun -p /sbin/ldconfig
 
 
 %files -f %{name}.lang
@@ -62,6 +77,13 @@
 
 
 %changelog
+* Tue Feb 5 2008 Kelly Miller <lightsolphoenix at gmail.com> 1.0.6-1
+- Updated TastyMenu to version 1.0.6.
+- Adjusted dependencies due to KDE name changes.
+
+* Mon Oct 22 2007 Kelly Miller <lightsolphoenix at gmail.com> 1.0.2-1
+- Updated TastyMenu to version 1.0.2.
+
 * Thu Aug 2 2007 Kelly Miller <lightsolphoenix at gmail.com> 0.8.2-2
 - Updated license to LGPL2+ as per new Fedora requirements.