14 Commits

Author SHA1 Message Date
a7dc5cb8c0 Fixed data/Makefile.am 2013-09-18 11:59:00 +02:00
8d3e16465d Incremented patch version 2013-09-18 11:55:40 +02:00
b7f7f0c02a Bug fix: gswe_moment_get_all_planets() didn't calculate planet positions before returning the list 2013-09-18 11:55:26 +02:00
7b28bb519c RPM spec file is now generated
Version number no longer needs to be updated
2013-09-18 11:54:05 +02:00
f814f26ef4 Fixed RPM version in .spec file 2013-09-17 09:53:19 +02:00
46a59fedf6 Fixed zodiac calculation in GsweMoment
Yielded GSWE_SIGN_NONE instead of GSWE_SIGN_ARIES at position 0.0
2013-09-17 09:43:10 +02:00
115f28a6ef Fixed version numbers in pkgconfig file 2013-09-16 22:56:54 +02:00
4fd39664cc Finished RPM spec file 2013-09-16 22:37:37 +02:00
04493abe7f Removed old RPM spec file 2013-09-16 22:13:26 +02:00
30a80efb13 Merge branch 'rpm' of github.com:gergelypolonkai/swe-glib into rpm 2013-09-16 22:12:28 +02:00
05ecbae941 Changed RPM spec file to version 1.0.1
This is to comply with semver.org specifications
2013-09-16 22:11:29 +02:00
610ecb34e9 Added RPM .spec file 2013-09-16 22:08:26 +02:00
4be745f748 Added micro (patch) version to comply with semver.org 2013-09-16 22:07:34 +02:00
59eb8fd306 Added RPM .spec file 2013-09-10 13:30:15 +02:00
7 changed files with 118 additions and 7 deletions

1
.gitignore vendored
View File

@@ -80,6 +80,7 @@ src/gswe-enumtypes.c
src/gswe-enumtypes.h src/gswe-enumtypes.h
src/gswetest src/gswetest
/data/swe-glib.pc /data/swe-glib.pc
/data/swe-glib.spec
# Documentation related files # Documentation related files
/docs/reference/*/*.args /docs/reference/*/*.args

View File

@@ -1,8 +1,12 @@
m4_define([swe_glib_api_version], [1.0]) m4_define([swe_glib_major_version], [1])
m4_define([swe_glib_minor_version], [0])
m4_define([swe_glib_micro_version], [3])
m4_define([swe_glib_version], [swe_glib_major_version.swe_glib_minor_version.swe_glib_micro_version])
m4_define([swe_glib_api_version], [swe_glib_major_version.0])
AC_INIT([swe-glib], [swe_glib_api_version], [gergely@polonkai.eu]) AC_INIT([SWE-GLib], [swe_glib_version], [gergely@polonkai.eu], [swe-glib])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall foreign]) AM_INIT_AUTOMAKE([-Wall foreign])
AC_CONFIG_HEADERS([config.h])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no) AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no)
@@ -10,6 +14,10 @@ if test "x$enable_debug" = "xyes" ; then
AC_DEFINE([DEBUG], [1], [Define if debugging is enabled]) AC_DEFINE([DEBUG], [1], [Define if debugging is enabled])
fi fi
AC_SUBST([SWE_GLIB_MAJOR_VERSION], [swe_glib_major_version])
AC_SUBST([SWE_GLIB_MINOR_VERSION], [swe_glib_minor_version])
AC_SUBST([SWE_GLIB_MICRO_VERSION], [swe_glib_micro_version])
AC_SUBST([SWE_GLIB_VERSION], [swe_glib_version])
AC_SUBST([SWE_GLIB_API_VERSION], [swe_glib_api_version]) AC_SUBST([SWE_GLIB_API_VERSION], [swe_glib_api_version])
AC_SUBST([SWE_GLIB_API_VERSION_U], [AS_TR_SH([swe_glib_api_version])]) AC_SUBST([SWE_GLIB_API_VERSION_U], [AS_TR_SH([swe_glib_api_version])])
@@ -50,5 +58,6 @@ AC_CONFIG_FILES([
docs/reference/swe-glib/version.xml docs/reference/swe-glib/version.xml
docs/reference/swe-glib/Makefile docs/reference/swe-glib/Makefile
data/swe-glib.pc data/swe-glib.pc
data/swe-glib.spec
]) ])
AC_OUTPUT AC_OUTPUT

View File

@@ -59,5 +59,7 @@ sweph_DATA = \
sweph-data/seplm54.se1 \ sweph-data/seplm54.se1 \
$(NULL) $(NULL)
EXTRA_DIST = $(sweph_DATA) EXTRA_DIST = \
$(sweph_DATA) \
swe-glib.spec

View File

@@ -5,7 +5,7 @@ includedir=@includedir@
Name: SWE-GLib Name: SWE-GLib
Description: GLib wrapper functions for the Swiss Ephemeris library Description: GLib wrapper functions for the Swiss Ephemeris library
Version: @SWE_GLIB_API_VERSION@ Version: @VERSION@
Requires: glib-2.0 Requires: glib-2.0
Libs: -L${libdir} -lswe-glib-@VERSION@ Libs: -L${libdir} -lswe-glib-@SWE_GLIB_API_VERSION@
Cflags: -I${includedir}/swe-glib Cflags: -I${includedir}/swe-glib

91
data/swe-glib.spec.in Normal file
View File

@@ -0,0 +1,91 @@
Name: swe-glib
Version: @SWE_GLIB_VERSION@
Release: 1%{?dist}
Summary: A GLib style wrapper library around the Swiss Ephemeris library, created by Astrodienst.
Group: Development/Libraries
License: LGPLv3+
URL: http://gergely.polonkai.eu/swe-glib/
Source: https://github.com/gergelypolonkai/%{name}/archive/v%{version}.tar.gz
BuildRequires: pkgconfig
BuildRequires: glib2-devel
BuildRequires: gettext
BuildRequires: automake autoconf libtool
BuildRequires: gtk-doc
Requires: glib2
Requires: %{name}-data = %{version}-%{release}
%description
SWE-GLib is a GLib style wrapper library around the Swiss Ephemeris library,
created by Astrodienst. It can be used for precise astronomical calculation
based on time and topographic location.
%package data
Summary: A GLib style wrapper library around the Swiss Ephemeris library, created by Astrodienst.
Group: Development/Libraries
BuildArch: noarch
%description data
The swe-glib-data package includes data files for the SWE-GLib library.
%package devel
Summary: A GLib style wrapper library around the Swiss Ephemeris library, created by Astrodienst.
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The swe-glib-devel package includes the header files for the SWE-GLib library.
%package doc
Summary: A GLib style wrapper library around the Swiss Ephemeris library, created by Astrodienst.
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
The swe-glib-doc package includes documentation for the SWE-GLib library.
%prep
%setup -q
%build
%configure --enable-gtk-doc
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/hu/LC_MESSAGES/swe-glib.mo
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%doc ChangeLog
%{_libdir}/libswe-1.75.so.*
%{_libdir}/libswe-glib-1.0.so.*
%{_libdir}/girepository-1.0/SweGlib-1.0.typelib
%files data
%{_datadir}/swe-glib/*.se1
%files doc
%doc %{_datadir}/gtk-doc/html/*
%files devel
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_datadir}/gir-1.0/SweGlib-1.0.gir
%{_libdir}/libswe-1.75.so
%{_libdir}/libswe-glib-1.0.so
%changelog

View File

@@ -28,7 +28,7 @@ BUILT_SOURCES = gswe-enumtypes.c gswe-enumtypes.h
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = gswe-enumtypes.h.template gswe-enumtypes.c.template swe-glib-private.h EXTRA_DIST = gswe-enumtypes.h.template gswe-enumtypes.c.template swe-glib-private.h $(INST_H_SRC_FILES)
gswe-enumtypes.h: $(gswe_headers) gswe-enumtypes.h.template gswe-enumtypes.h: $(gswe_headers) gswe-enumtypes.h.template
$(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \ $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \

View File

@@ -476,6 +476,12 @@ gswe_calculate_data_by_position(GsweMoment *moment, GswePlanet planet, gdouble p
sign = (GsweZodiac)ceil(position / 30.0); sign = (GsweZodiac)ceil(position / 30.0);
// If position happens to be exactly 0, this calculation yields
// GSWE_SIGN_NONE, but should be GSWE_SIGN_ARIES
if (sign == 0) {
sign = 1;
}
if ((sign_info = g_hash_table_lookup(gswe_sign_info_table, GINT_TO_POINTER(sign))) == NULL) { if ((sign_info = g_hash_table_lookup(gswe_sign_info_table, GINT_TO_POINTER(sign))) == NULL) {
g_error("Calculations brought an unknown sign!"); g_error("Calculations brought an unknown sign!");
} }
@@ -715,6 +721,8 @@ gswe_moment_calculate_all_planets(GsweMoment *moment)
GList * GList *
gswe_moment_get_all_planets(GsweMoment *moment) gswe_moment_get_all_planets(GsweMoment *moment)
{ {
gswe_moment_calculate_all_planets(moment);
return moment->priv->planet_list; return moment->priv->planet_list;
} }