diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c8b27cc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libtimezonemap_0.4.4.tar.gz diff --git a/.libtimezonemap.metadata b/.libtimezonemap.metadata new file mode 100644 index 0000000..5f0a989 --- /dev/null +++ b/.libtimezonemap.metadata @@ -0,0 +1 @@ +d64803bd48f9ed1ab174f67d02d280a867731440 SOURCES/libtimezonemap_0.4.4.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Added-a-glade-catalog-file.patch b/SOURCES/0001-Added-a-glade-catalog-file.patch new file mode 100644 index 0000000..076ef86 --- /dev/null +++ b/SOURCES/0001-Added-a-glade-catalog-file.patch @@ -0,0 +1,103 @@ +From 9148e44277d558b6f0ca2882e8b511bc31c27f04 Mon Sep 17 00:00:00 2001 +From: David Shea +Date: Wed, 27 Nov 2013 11:22:42 -0500 +Subject: [PATCH 1/2] Added a glade catalog file. + +This allows CcTimezoneMap and CcTimezoneCompletion to be used in glade. +--- + Makefile.am | 2 +- + configure.ac | 1 + + glade/Makefile.am | 2 ++ + glade/TimezoneMap.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 51 insertions(+), 1 deletion(-) + create mode 100644 glade/Makefile.am + create mode 100644 glade/TimezoneMap.xml + +diff --git a/Makefile.am b/Makefile.am +index 960f89c..15740b2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +-SUBDIRS = src ++SUBDIRS = src glade + + DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall + +diff --git a/configure.ac b/configure.ac +index 46d26cd..4c079fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,6 +79,7 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all + + AC_CONFIG_FILES([ + Makefile ++glade/Makefile + src/Makefile + src/timezonemap.pc + ]) +diff --git a/glade/Makefile.am b/glade/Makefile.am +new file mode 100644 +index 0000000..37bde31 +--- /dev/null ++++ b/glade/Makefile.am +@@ -0,0 +1,2 @@ ++gladedir = $(datadir)/glade/catalogs ++dist_glade_DATA = TimezoneMap.xml +diff --git a/glade/TimezoneMap.xml b/glade/TimezoneMap.xml +new file mode 100644 +index 0000000..a43e925 +--- /dev/null ++++ b/glade/TimezoneMap.xml +@@ -0,0 +1,47 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ glade_gtk_cell_layout_add_verify ++ glade_gtk_cell_layout_add_child ++ glade_gtk_cell_layout_remove_child ++ glade_gtk_cell_layout_get_children ++ glade_gtk_cell_layout_read_child ++ glade_gtk_cell_layout_write_child ++ glade_gtk_cell_layout_action_activate ++ glade_gtk_cell_layout_set_child_property ++ glade_gtk_cell_layout_get_child_property ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +1.9.0 + diff --git a/SPECS/libtimezonemap.spec b/SPECS/libtimezonemap.spec new file mode 100644 index 0000000..cd2bcce --- /dev/null +++ b/SPECS/libtimezonemap.spec @@ -0,0 +1,121 @@ +Name: libtimezonemap +Version: 0.4.4 +Release: 1%{?dist} +Summary: Time zone map widget for Gtk+ + +Group: System Environment/Libraries +License: GPLv3 +URL: https://launchpad.net/timezonemap +Source0: http://archive.ubuntu.com/ubuntu/pool/main/libt/libtimezonemap/%{name}_%{version}.tar.gz + +# From lp:~dshea/timezonemap/glade-catalog +Patch1: 0001-Added-a-glade-catalog-file.patch + +BuildRequires: glib2-devel >= 2.26 +BuildRequires: gtk3-devel >= 3.1.4 +BuildRequires: json-glib-devel +BuildRequires: gobject-introspection-devel +BuildRequires: gnome-common +BuildRequires: libsoup-devel >= 2.42.0 + +%description +libtimezonemap is a time zone map widget for Gtk+. The widget displays a world +map with a highlighted region representing the selected time zone, and the +location can be changed by clicking on the map. + +This library is a fork of the of the code from gnome-control-center's datetime +panel, which was itself a fork of Ubiquity's timezone map. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +libtimezonemap is a time zone map widget for Gtk+. This package contains header +files used for building applications that use %{name}. + +%prep +%setup -q +%patch1 -p1 + +%build +./autogen.sh +%configure +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/*.la + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%license COPYING +%doc README TODO +%{_libdir}/libtimezonemap.so.* +%{_libdir}/girepository-1.0/TimezoneMap-1.0.typelib +%{_datadir}/%{name} + +%files devel +%{_libdir}/libtimezonemap.so +%{_libdir}/pkgconfig/timezonemap.pc +%{_includedir}/timezonemap +%{_datadir}/gir-1.0/TimezoneMap-1.0.gir +%{_datadir}/glade/catalogs/TimezoneMap.xml + +%changelog +* Fri May 8 2015 David Shea - 0.4.4-1 +- Fixes for LP#1440157: + Port to libsoup directly for geoname results + Fix some memory leaks + Do not reuse GCancellables +- Upstream merges of SVG update and constrained location cycles + +* Fri May 1 2015 David Shea - 0.4.2-6 +- Updated the time zone map images +- Updated the city data from geonames.org +- Fix a memory leak and potential crash with the locations list +- Cycle through a smaller list of map locations on repeated clicks + +* Wed Jan 28 2015 David Shea - 0.4.2-5 +- Use %license for the license file + +* Sun Aug 17 2014 Fedora Release Engineering - 0.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 0.4.2-3 +- Rebuilt for gobject-introspection 1.41.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 0.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 2 2014 David Shea - 0.4.2-1 +- New upstream release libtimezonemap-0.4.2 + +* Mon Dec 2 2013 David Shea - 0.4.1-4 +- Merge fixes from lp:timezonemap +- Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) +- Set en_name correctly (iain.lane) +- Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane) + +* Wed Nov 27 2013 David Shea - 0.4.1-3 +- Added a glade catalog file (dshea) + +* Tue Nov 26 2013 David Shea - 0.4.1-2 +- Make whitespace and indentation consistent (iain.lane@canonical.com) +- Switched to a git-formatted patch for the FSF address to make things easier + for me to track (dshea) +- Create local copies of string properties. (dshea) +- Moved CcTimezoneLocation into its own file. (dshea) +- Don't close a NULL file pointer. (dshea) +- Turn on and fix g-ir-scanner warnings. (dshea) +- Added a .bzrignore file to ignore all the files generated by the build. (dshea) +- Ignore the INSTALL file (dshea) +- Added a function to clear the location set for a CcTimezoneMap (dshea) +- Allow the timezone highlight to be manually set separately from the location. (dshea) + +* Thu Nov 14 2013 David Shea - 0.4.1-1 +- Initial version