rpms/glglobe/devel glglobe-0.2-fix-newline-warnings.patch, NONE, 1.1 glglobe-0.2-fix-signedness-differs-warnings.patch, NONE, 1.1 glglobe-0.2-makefile_accept_passed_optflags.patch, NONE, 1.1 glglobe-0.2-set-default-params.patch, NONE, 1.1 glglobe.16x16.png, NONE, 1.1 glglobe.24x24.png, NONE, 1.1 glglobe.48x48.png, NONE, 1.1 glglobe.desktop, NONE, 1.1 glglobe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
David Timms (dtimms)
fedora-extras-commits at redhat.com
Mon Aug 13 22:38:34 UTC 2007
Author: dtimms
Update of /cvs/pkgs/rpms/glglobe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31743/devel
Modified Files:
.cvsignore sources
Added Files:
glglobe-0.2-fix-newline-warnings.patch
glglobe-0.2-fix-signedness-differs-warnings.patch
glglobe-0.2-makefile_accept_passed_optflags.patch
glglobe-0.2-set-default-params.patch glglobe.16x16.png
glglobe.24x24.png glglobe.48x48.png glglobe.desktop
glglobe.spec
Log Message:
Initial import of glglobe into cvs, version 0.2
glglobe-0.2-fix-newline-warnings.patch:
--- NEW FILE glglobe-0.2-fix-newline-warnings.patch ---
diff -u glglobe/jpg_loader.h glglobe-patched/jpg_loader.h
--- glglobe/jpg_loader.h 2001-09-02 17:52:16.000000000 +1000
+++ glglobe-patched/jpg_loader.h 2006-05-30 00:19:33.000000000 +1000
@@ -8,4 +8,4 @@
write_jpeg(FILE *outfile, int width, int height, unsigned char *rgb,
int quality);
-#endif
\ No newline at end of file
+#endif
diff -u glglobe/markers_parser.c glglobe-patched/markers_parser.c
--- glglobe/markers_parser.c 2001-09-06 02:22:08.000000000 +1000
+++ glglobe-patched/markers_parser.c 2006-05-30 00:36:13.000000000 +1000
@@ -136,4 +136,4 @@
return 0;
}
-*/
\ No newline at end of file
+*/
diff -u glglobe/options.h glglobe-patched/options.h
--- glglobe/options.h 2001-09-21 01:09:10.000000000 +1000
+++ glglobe-patched/options.h 2006-05-30 00:14:32.000000000 +1000
@@ -14,4 +14,4 @@
#define options_ball_shadows 1
#define options_queue_shadows 1
-#undef DEBUG
\ No newline at end of file
+#undef DEBUG
glglobe-0.2-fix-signedness-differs-warnings.patch:
--- NEW FILE glglobe-0.2-fix-signedness-differs-warnings.patch ---
--- glglobe/globe.c 2001-09-23 02:33:13.000000000 +1000
+++ glglobe-patched/globe.c 2006-05-31 23:31:25.000000000 +1000
@@ -416,7 +416,7 @@
int globe_id;
int allw,allh,alld;
char * alldata;
- static int texbind[10000];
+ static unsigned int texbind[10000];
load_png( filename, &allw, &allh, &alld, &alldata );
@@ -497,7 +497,7 @@
int globe_id;
int allw,allh,alld;
unsigned char * alldata;
- static int texbind[10000];
+ static unsigned int texbind[10000];
if ( strcasecmp(&filename[strlen(filename)-4],".jpg")==0 ){
allw=1536; allh=768;
@@ -633,7 +633,7 @@
int allw,allh,alld;
int nth, nph;
unsigned char * alldata;
- static int texbind[10000];
+ static unsigned int texbind[10000];
static int texnr=0;
double x_new,y_new, x_d,y_d, val;
int ic, allw_new, allh_new;
glglobe-0.2-makefile_accept_passed_optflags.patch:
--- NEW FILE glglobe-0.2-makefile_accept_passed_optflags.patch ---
--- glglobe/makefile 2001-09-02 18:11:48.000000000 +1000
+++ glglobe-patched/makefile 2007-07-29 22:06:18.000000000 +1000
@@ -5,7 +5,7 @@
#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz -ljpeg
#CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
-CFLAGS = -Wall -O3 -I$(INCDIR)
+CFLAGS ?= -Wall -O3 -I$(INCDIR)
OBJS = glglobe.o \
@@ -32,4 +32,4 @@
clean:
rm *.o $(NAME) *~
-
\ No newline at end of file
+
glglobe-0.2-set-default-params.patch:
--- NEW FILE glglobe-0.2-set-default-params.patch ---
--- glglobe/glglobe.c 2001-09-25 00:50:31.000000000 +1000
+++ glglobe-patched/glglobe.c 2006-06-25 19:17:08.000000000 +1000
@@ -96,7 +96,7 @@
static char map_path[256];
-static char * map_path_default = "/usr/X11R6/lib/X11/xglobe/";
+static char * map_path_default = "/usr/share/glglobe/";
//static char * map_path = "./";
static struct dirent ** map_namelist;
@@ -881,9 +881,11 @@
strcpy(map_path, map_path_default);
// strcpy(mapfilename,map_path);
- strcpy(mapfilename,"depths_1440.jpg");
+ strcpy(mapfilename, map_path);
+ strcat(mapfilename,"depths_1440.jpg");
// strcpy(mapfilename,"depths_1440.jpg");
- strcpy(markerfilename,"xglobe-markers");
+ strcpy(markerfilename, map_path);
+ strcat(markerfilename,"xglobe-markers");
tact=time(NULL);
@@ -925,6 +927,10 @@
}
}
+ printf("map_path=%s\n",map_path);
+ printf("mapfilename=%s\n",mapfilename);
+ printf("markerfilename=%s\n",markerfilename);
+
glutInitWindowPosition(0, 0);
// glutInitWindowSize( 800, 800 );
glutInitWindowSize(WIDTH, HEIGHT);
--- NEW FILE glglobe.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=GL Globe Simulator
GenericName=Globe (Earth) Simulation
Comment=Globe (Earth) simulation written in OpenGL
Categories=Education;
Exec=glglobe
Icon=glglobe.24x24.png
Terminal=false
Type=Application
X-Desktop-File-Install-Version=0.4
Name[en_AU]=GL Globe Simulator
--- NEW FILE glglobe.spec ---
Name: glglobe
Version: 0.2
Release: 5%{?dist}
Summary: OpenGl Globe - Earth simulation for linux
Group: Amusements/Graphics
License: GPLv2
URL: http://www.geocities.com/harpin_floh/glglobe_page.html
Source0: http://www.geocities.com/harpin_floh/mysoft/glglobe-0.2.tar.gz
# glglobe does not have icons of its own. I modifed the upstream website's
# banner logo, selected a limited part to get the sun effect, then scaled that
# to the standard icon sizes required. On 2007-07-29 I requested upstream to
# provide suitable icons, or provide feedback on those I created, but no
# response has been received.
Source1: glglobe.16x16.png
Source2: glglobe.24x24.png
Source3: glglobe.48x48.png
# This desktop file was created by hand.
Source4: glglobe.desktop
Patch0: glglobe-0.2-fix-newline-warnings.patch
Patch1: glglobe-0.2-fix-signedness-differs-warnings.patch
# if the default params are not set, glglobe segfaults when the middle click
# menu is activated
Patch2: glglobe-0.2-set-default-params.patch
Patch3: glglobe-0.2-makefile_accept_passed_optflags.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: freeglut-devel libpng-devel libjpeg-devel
BuildRequires: libXext-devel libXaw-devel libXi-devel desktop-file-utils
##Requires: todo!
%description
GLGlobe is an OpenGL - globe simulation for Linux. It was inspired by XGlobe or
XEarth and can use the marker-files of these programs. The simulation includes
day light and night time rendering, and the globe can be rotated and scaled
interactively, or automatically rotated based on the current time of day
%prep
# -n sets tgz extract folder to match version
%setup -q -n glglobe
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
#no configure, so:
export CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
# manual install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m 0755 glglobe %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/glglobe
install -p -m 0644 depths_1440.jpg xglobe-markers earth-markers-schaumann %{buildroot}%{_datadir}/glglobe
#mkdir -p %{buildroot}%{_docdir}/glglobe
#install -p -m 0644 ChangeLog COPYING README TODO %{buildroot}%{_docdir}/glglobe
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
install -p -m 644 %{SOURCE1} \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
install -p -m 644 %{SOURCE2} \
%{buildroot}%{_datadir}/icons/hicolor/24x24/apps/
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
install -p -m 644 %{SOURCE3} \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
mkdir -p %{buildroot}%{_datadir}/applications
#install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications %{SOURCE4}
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%{_bindir}/glglobe
%{_datadir}/glglobe
%{_datadir}/applications/fedora-glglobe.desktop
%{_datadir}/icons/hicolor/*/apps/glglobe.*.png
%doc ChangeLog COPYING README TODO
%changelog
* Sat Aug 11 2007 David Timms <dtimms at iinet.net.au> - 0.2-5
- actually build with updated .desktop file
* Thu Aug 9 2007 David Timms <dtimms at iinet.net.au> - 0.2-4
- add comment re Source1..4 creation
- mod .desktop category to Education
- del .desktop category deprecated items
- del extraneous Requires(post/postun) for desktop-file-utils
- mod desktop-file-install to simpler command, using SOURCEx
- add ownership of app data directory
- mod ownership of icon data to glglobe specific filenames
- mod License to meet new Licensing Guidelines
* Tue Jul 31 2007 David Timms <dtimms at iinet.net.au> - 0.2-3
- add BuildRequires: desktop-file-utils so that it builds in mock
* Sun Jul 29 2007 David Timms <dtimms at iinet.net.au> - 0.2-2
- del commenting about non-existent configure.
- add export CFLAGS="$RPM_OPT_FLAGS" so that rpm flags are used during build.
- add makefile patch to use environment CFLAGS if they are defined.
* Sun Jul 29 2007 David Timms <dtimms at iinet.net.au> - 0.2-1
- Initial fedora package submission for review
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glglobe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Aug 2007 19:41:06 -0000 1.1
+++ .cvsignore 13 Aug 2007 22:38:01 -0000 1.2
@@ -0,0 +1 @@
+glglobe-0.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glglobe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Aug 2007 19:41:06 -0000 1.1
+++ sources 13 Aug 2007 22:38:01 -0000 1.2
@@ -0,0 +1 @@
+4baf3a78163ff3550c9bd926be71016f glglobe-0.2.tar.gz
More information about the fedora-extras-commits
mailing list