Update to newest version

4 files changed, 56 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c89f8a12767..c28d64671ecc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rubrica
-	pkgdesc = An addressbook manager for the GNOME desktop
-	pkgver = 2.0.2
-	pkgrel = 2
+	pkgdesc = An address book manager for the GNOME desktop
+	pkgver = 2.0.12
+	pkgrel = 1
 	url = http://rubrica.berlios.de/
 	install = rubrica.install
 	arch = i686
@@ -15,10 +15,10 @@ pkgbase = rubrica
 	depends = gconf
 	depends = shared-mime-info
 	options = !libtool
-	source = http://download.berlios.de/rubrica/rubrica2-2.0.2.tar.bz2
-	source = rubrica-2.0.2.diff
-	md5sums = a3b57d15d8ccd5bcc1a0c5be29ae08bc
-	md5sums = 7fdf967461a8a56c92883746b6f412e8
+	source = http://downloads.sourceforge.net/project/rubrica.berlios/rubrica2-2.0.12.tar.bz2
+	source = rubrica-2.0.12.diff
+	md5sums = 582b9e8c4ca9b17f83afa5a3d5842bc9
+	md5sums = 7219902d5722841342cf3186f18211db
 
 pkgname = rubrica
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c273bfccbab..d777569fb78d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Contributor: Tim Yang <tdy@gmx.com>
 # Contributor: mgzzy <themgzzy@gmail.com>
+# Contributor: kaptoxic @ yahoo . com
 pkgname=rubrica
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="An addressbook manager for the GNOME desktop"
+pkgver=2.0.12
+pkgrel=1
+pkgdesc="An address book manager for the GNOME desktop"
 arch=('i686' 'x86_64')
 url="http://rubrica.berlios.de/"
 license=('GPL3')
@@ -11,15 +12,19 @@ depends=('desktop-file-utils' 'libglade' 'libnotify' 'gconf' 'shared-mime-info')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool')
 install=rubrica.install
-source=(http://download.berlios.de/rubrica/rubrica2-$pkgver.tar.bz2
-        rubrica-$pkgver.diff)
-md5sums=('a3b57d15d8ccd5bcc1a0c5be29ae08bc'
-         '7fdf967461a8a56c92883746b6f412e8')
+source=(http://downloads.sourceforge.net/project/rubrica.berlios/rubrica2-2.0.12.tar.bz2
+	rubrica-2.0.12.diff)
+md5sums=('582b9e8c4ca9b17f83afa5a3d5842bc9'
+         '7219902d5722841342cf3186f18211db')
 
 build() {
   cd "$srcdir/rubrica2-$pkgver"
-  patch -Np1 -i ../rubrica-$pkgver.diff || return 1
-  ./configure --prefix=/usr --disable-schemas-install || return 1
+  patch -Np2 -i ../rubrica-$pkgver.diff || return 1
+  ./configure --prefix=/usr --disable-schemas-install LIBS=-lgthread-2.0 --with-gconf-schema-file-dir=/usr/share/gconf/schemas || return 1
   make || return 1
+}
+
+package() {
+  cd "$srcdir/rubrica2-$pkgver"
   make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/rubrica-2.0.12.diff b/rubrica-2.0.12.diff
new file mode 100644
index 000000000000..3edd987e2675
--- /dev/null
+++ b/rubrica-2.0.12.diff
@@ -0,0 +1,35 @@
+--- src/rubrica2-2.0.12/interface/MainWindow.glade	2010-06-20 08:23:49.000000000 -0400
++++ src2/rubrica2-2.0.12/interface/MainWindow.glade	2015-12-05 02:34:39.435638633 -0500
+@@ -84,7 +84,7 @@
+             <child>
+               <widget class="GtkMenuItem" id="menuitem2">
+                 <property name="visible">True</property>
+-                <property name="label">_Modifica</property>
++                <property name="label">_Edit</property>
+                 <property name="use_underline">True</property>
+                 <child>
+                   <widget class="GtkMenu" id="menuitem2_menu">
+@@ -173,7 +173,7 @@
+             <child>
+               <widget class="GtkMenuItem" id="menuitem4">
+                 <property name="visible">True</property>
+-                <property name="label">A_iuto</property>
++                <property name="label">_Help</property>
+                 <property name="use_underline">True</property>
+                 <child>
+                   <widget class="GtkMenu" id="menuitem4_menu">
+--- src/rubrica2-2.0.12/rubrica2.desktop.in	2011-12-03 13:48:41.000000000 -0500
++++ src2/rubrica2-2.0.12/rubrica2.desktop.in	2015-12-05 02:34:39.422305298 -0500
+@@ -3,10 +3,10 @@
+ Name[it]=Rubrica
+ Comment[en]=Manage contacts and addresses
+ Comment[it]=Gestore di contatti per GNOME
+-MimeType=application/x-rubrica
++MimeType=application/x-rubrica;
+ Patterns=*.rub;*.RUB;
+ Exec=rubrica2
+-Icon=stock_addressbook.png
++Icon=rubrica2
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Application;Office;
diff --git a/rubrica-2.0.2.diff b/rubrica-2.0.2.diff
deleted file mode 100644
index 0ccb863c1f3f..000000000000
--- a/rubrica-2.0.2.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur rubrica2-2.0.2~/configure rubrica2-2.0.2/configure
---- rubrica2-2.0.2~/configure	2009-01-25 01:31:39.000000000 -0600
-+++ rubrica2-2.0.2/configure	2009-01-25 01:31:43.000000000 -0600
-@@ -21139,7 +21139,7 @@
- 	     && mktime_test ((time_t) (60 * 60 * 24))))
- 	return 1;
- 
--      for (j = 1; 0 < j; j *= 2)
-+      for (j = 1; 0 < j; j <<= 2)
- 	if (! bigtime_test (j))
- 	  return 1;
-       if (! bigtime_test (j - 1))
-diff -Naur rubrica2-2.0.2~/interface/MainWindow.glade rubrica2-2.0.2/interface/MainWindow.glade
---- rubrica2-2.0.2~/interface/MainWindow.glade	2009-01-25 01:31:39.000000000 -0600
-+++ rubrica2-2.0.2/interface/MainWindow.glade	2009-01-25 01:31:43.000000000 -0600
-@@ -84,7 +84,7 @@
-             <child>
-               <widget class="GtkMenuItem" id="menuitem2">
-                 <property name="visible">True</property>
--                <property name="label">_Modifica</property>
-+                <property name="label">_Edit</property>
-                 <property name="use_underline">True</property>
-                 <child>
-                   <widget class="GtkMenu" id="menuitem2_menu">
-@@ -173,7 +173,7 @@
-             <child>
-               <widget class="GtkMenuItem" id="menuitem4">
-                 <property name="visible">True</property>
--                <property name="label">A_iuto</property>
-+                <property name="label">_Help</property>
-                 <property name="use_underline">True</property>
-                 <child>
-                   <widget class="GtkMenu" id="menuitem4_menu">
-diff -Naur rubrica2-2.0.2~/Makefile.in rubrica2-2.0.2/Makefile.in
---- rubrica2-2.0.2~/Makefile.in	2009-01-25 01:31:39.000000000 -0600
-+++ rubrica2-2.0.2/Makefile.in	2009-01-25 01:32:12.000000000 -0600
-@@ -69,7 +69,7 @@
- 	"$(DESTDIR)$(schemadir)"
- desktopDATA_INSTALL = $(INSTALL_DATA)
- mimeDATA_INSTALL = $(INSTALL_DATA)
--schemaDATA_INSTALL = $(INSTALL_DATA)
-+schemaDATA_INSTALL = gconf-merge-schema
- DATA = $(desktop_DATA) $(mime_DATA) $(schema_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -419,12 +419,12 @@
- 	done
- install-schemaDATA: $(schema_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
-+	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/gconf/schemas"
- 	@list='$(schema_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \
--	  $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \
-+	  echo " $(schemaDATA_INSTALL) '$(DESTDIR)$(datadir)/gconf/schemas/$$f' '$$d$$p'"; \
-+	  $(schemaDATA_INSTALL) "$(DESTDIR)$(datadir)/gconf/schemas/$$f" "$$d$$p"; \
- 	done
- 
- uninstall-schemaDATA:
-diff -Naur rubrica2-2.0.2~/rubrica2.desktop.in rubrica2-2.0.2/rubrica2.desktop.in
---- rubrica2-2.0.2~/rubrica2.desktop.in	2009-01-25 01:31:39.000000000 -0600
-+++ rubrica2-2.0.2/rubrica2.desktop.in	2009-01-25 01:31:43.000000000 -0600
-@@ -1,16 +1,12 @@
- [Desktop Entry]
-+Version=1.0
- Name=Rubrica Addressbook
--_Name=Rubrica Addressbook
- Comment=Manage contacts and addresses
- Comment[it]=Gestore di contatti e indirizzi
--_Comment=Manage contacts and addresses
--MimeType=application/x-rubrica
--Patterns=*.rub;*.RUB;
-+MimeType=application/x-rubrica;
- Exec=@PACKAGE_NAME@
--Icon=stock_addressbook.png
-+Icon=/usr/share/pixmaps/@PACKAGE_NAME@/48x48/rubrica.png
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Office;
-+Categories=GNOME;Office;
- StartupNotify=true
--Encoding=UTF-8
--