rpms/glunarclock/F-12 glunarclock-0.34.1-dsolink.patch, NONE, 1.1 glunarclock.spec, 1.24, 1.25 sources, 1.6, 1.7

Jon Ciesla limb at fedoraproject.org
Wed Mar 17 20:34:37 UTC 2010


Author: limb

Update of /cvs/pkgs/rpms/glunarclock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8108/F-12

Modified Files:
	glunarclock.spec sources 
Added Files:
	glunarclock-0.34.1-dsolink.patch 
Log Message:
New upstream, fixes crash, DSOLinking.


glunarclock-0.34.1-dsolink.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glunarclock-0.34.1-dsolink.patch ---
--- src/Makefile.in~	2010-03-17 08:43:53.000000000 -0500
+++ src/Makefile.in	2010-03-17 13:58:03.727077502 -0500
@@ -167,7 +167,7 @@
 LDFLAGS = @LDFLAGS@
 LIBDIR = @LIBDIR@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lm
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@


Index: glunarclock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glunarclock/F-12/glunarclock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- glunarclock.spec	25 Jul 2009 00:26:35 -0000	1.24
+++ glunarclock.spec	17 Mar 2010 20:34:36 -0000	1.25
@@ -1,15 +1,16 @@
 Name:           glunarclock
-Version:        0.32.4
-Release:        15%{?dist}
+Version:        0.34.1
+Release:        1%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://glunarclock.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         glunarclock-0.32.2-i18n_macro.patch
-Patch1:         glunarclock-0.32.4-bug149711.patch
-Patch2:		glunarclock-0.32.4-libgnomeui.patch
+#Patch0:         glunarclock-0.32.2-i18n_macro.patch
+#Patch1:         glunarclock-0.32.4-bug149711.patch
+#Patch2:          glunarclock-0.32.4-libgnomeui.patch
+Patch3:         glunarclock-0.34.1-dsolink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -20,6 +21,8 @@ BuildRequires:  scrollkeeper
 BuildRequires:  gnome-panel-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  perl-XML-Parser
+BuildRequires:  intltool
+BuildRequires:  gnome-doc-utils
 Requires(post): GConf2
 Requires(preun): GConf2
 Requires(post): scrollkeeper
@@ -34,15 +37,18 @@ rise and set times, and the coordinates 
 
 %prep
 %setup -q
-%patch0 -p1 -b .i18n_macro
-%patch1 -p1 -b .bug149711
-%patch2 -p0
+#%patch0 -p1 -b .i18n_macro
+#%patch1 -p1 -b .bug149711
+#%patch2 -p0
+%patch3 -p0
 
 %build
-autoconf
+#./autogen.sh
+#autoconf
 %configure
 make %{?_smp_mflags}
-
+#cd po
+#make update-po
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,11 +59,12 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-%find_lang glunarclock-0.32
+%find_lang glunarclock
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644 man/glunarclock.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
+#mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/src-glunarclock-c $RPM_BUILD_ROOT%{_datadir}/pixmaps/glunarclock
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,7 +85,7 @@ fi
 scrollkeeper-update -q || :
 
 
-%files -f glunarclock-0.32.lang
+%files -f glunarclock.lang
 %defattr (-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README
 %{_sysconfdir}/gconf/schemas/*
@@ -93,6 +100,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Tue Mar 16 2010 Jon Ciesla <limb at jcomserv.net> - 0.34.1-1
+- Modernization, fix for crashes.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glunarclock/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Jul 2005 07:19:36 -0000	1.6
+++ sources	17 Mar 2010 20:34:36 -0000	1.7
@@ -1 +1 @@
-63e1d989581e6bf95cec82ff1bbc56ef  glunarclock-0.32.4.tar.gz
+09b622644b7d8b101369bc79f93a9ee0  glunarclock-0.34.1.tar.gz



More information about the scm-commits mailing list