rpms/gadmin-squid/devel gadmin-squid-0.1.0-POTFILES.patch, NONE, 1.1 gadmin-squid-0.1.0-desktop-icon.patch, NONE, 1.1 gadmin-squid-0.1.0-desktop.patch, NONE, 1.1 gadmin-squid.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sat Aug 9 01:56:55 UTC 2008

Author: baard

Update of /cvs/pkgs/rpms/gadmin-squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31622/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gadmin-squid-0.1.0-POTFILES.patch 
	gadmin-squid-0.1.0-desktop-icon.patch 
	gadmin-squid-0.1.0-desktop.patch gadmin-squid.spec import.log 
Log Message:
Initial commit


gadmin-squid-0.1.0-POTFILES.patch:

--- NEW FILE gadmin-squid-0.1.0-POTFILES.patch ---
diff -u gadmin-squid-0.1.0/po/POTFILES.in.orig gadmin-squid-0.1.0/po/POTFILES.in
--- gadmin-squid-0.1.0/po/POTFILES.in.orig	2003-02-25 18:23:22.000000000 +0100
+++ gadmin-squid-0.1.0/po/POTFILES.in	2008-06-09 15:53:43.000000000 +0200
@@ -1,6 +1,33 @@
 # List of source files containing translatable strings.
-
-src/main.c
-src/interface.c
-src/callbacks.c
+src/add_standard_users.c
+src/add_user.c
+src/clear_cache_tab.c
+src/clear_error_tab.c
+src/create_access_tab.c
+src/create_acl_tab.c
+src/create_cache_tab.c
+src/create_del_system_user_question.c
+src/create_disc_tab.c
+src/create_error_tab.c
+src/create_main_window.c
+src/create_server_settings.c
+src/create_server_tab.c
+src/create_swap_dirs.c
+src/create_transfer_tab.c
+src/create_user_settings.c
+src/create_user_tab.c
+src/credits_window.c
+src/delete_user.c
+src/functions.c
+src/generate_cert.c
+src/populate_acl_tab.c
+src/populate_cache_tab.c
+src/populate_error_tab.c
+src/populate_server_settings.c
+src/populate_shell_combo.c
+src/set_version.c
+src/show_help.c
+src/show_info.c
+src/standard_conf.c
+src/status_update.c
 src/support.c


gadmin-squid-0.1.0-desktop-icon.patch:

--- NEW FILE gadmin-squid-0.1.0-desktop-icon.patch ---
--- gadmin-squid-0.1.0-orig/desktop/net-gadmin-squid.desktop	2008-02-19 23:00:32.000000000 +0100
+++ gadmin-squid-0.1.0/desktop/net-gadmin-squid.desktop	2008-06-09 16:21:29.000000000 +0200
@@ -16,7 +16,7 @@
 GenericName=GADMIN-SQUID
 Comment=Squid proxy server administration
 Exec=gadmin-squid
-Icon=gadmin-squid.png
+Icon=gadmin-squid
 Terminal=false
 Type=Application
 Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;

gadmin-squid-0.1.0-desktop.patch:

--- NEW FILE gadmin-squid-0.1.0-desktop.patch ---
--- gadmin-squid-0.1.0-orig/Makefile.am	2008-02-19 23:08:02.000000000 +0100
+++ gadmin-squid-0.1.0/Makefile.am	2008-08-02 22:24:37.000000000 +0200
@@ -5,6 +5,13 @@
 SUBDIRS = src po
 
 EXTRA_DIST = \
+	desktop/net-gadmin-squid.desktop \
+	ChangeLog              \
+	COPYING                \
+	AUTHORS                \
+	README                 \
+	NEWS                   \
+	TODO                   \
 	autogen.sh
 
 install-data-local:
@@ -39,14 +46,16 @@
 	if test -d $(DESTDIR)$(datadir)/gnome/apps/Internet; then \
 	   cp desktop/net-gadmin-squid.desktop $(DESTDIR)$(datadir)/gnome/apps/Internet/; \
 	fi;
-	if test ! -d $(DESTDIR)$(datadir)/doc/gadmin-squid; then \
-	   $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/gadmin-squid; \
+	if test ! -d $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION); then \
+	   $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION); \
 	fi;
-	if test -d $(DESTDIR)$(datadir)/doc/gadmin-squid; then \
-	   cp AUTHORS $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp README $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp ChangeLog $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp COPYING $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
+	if test -d $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION); then \
+	   cp AUTHORS $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
+	   cp README $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
+	   cp ChangeLog $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
+	   cp COPYING $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
+	   cp NEWS $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
+	   cp TODO $(DESTDIR)$(datadir)/doc/gadmin-squid-$(VERSION)/; \
 	fi;
 	if test ! -d $(DESTDIR)$(sysconfdir)/gadmin-squid; then \
 	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gadmin-squid; \


--- NEW FILE gadmin-squid.spec ---
Summary:    GADMIN-SQUID -- A GTK+ administation tool for the Squid proxy server
Name:       gadmin-squid
Version:    0.1.0
Release:    0.4%{?dist}
License:    GPLv3+
Group:      Applications/System
URL:        http://sebuka.org/gadmintools/index.php?option=com_content&task=view&id=47&Itemid=37
Source0:    http://mange.dynalias.org/linux/%{name}/%{name}-%{version}.tar.gz
Patch1:     gadmin-squid-0.1.0-desktop.patch
Patch2:     gadmin-squid-0.1.0-POTFILES.patch
Patch3:     gadmin-squid-0.1.0-desktop-icon.patch
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:   usermode >= 1.36
Requires:   squid >= 2.6

# Only need to explicitly include these for EPEL
%if 0%{?rhel}
BuildRequires: autoconf
BuildRequires: automake
%endif
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext-devel

%description
GADMIN-SQUID is a fast and easy to use GTK+ administration tool 
for the Squid proxy server

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Need to do this, because of old aclocal.m4 and Makefile.in inside the upstream tarball
%{__aclocal}
%{__automake} --add-missing --gnu ${am_opt};
%configure

%build
%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
CFLAGS=$RPM_OPT_FLAGS %{__make} DESTDIR=%{buildroot} install 

# pam auth
install -d %{buildroot}%{_sysconfdir}/pam.d/
install -d %{buildroot}%{_sysconfdir}/security/console.apps
install -m 644 etc/pam.d/%{name} %{buildroot}%{_sysconfdir}/pam.d/%{name}
install -m 644 etc/security/console.apps/%{name} %{buildroot}%{_sysconfdir}/security/console.apps/%{name}

# desktop entry
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Red-Hat-Base \
  --add-category X-Red-Hat-ServerConfig \
  desktop/net-%{name}.desktop

mkdir -p %{buildroot}%{_bindir}
if test ! -h %{buildroot}%{_bindir}/%{name}; then \
 ln -s consolehelper %{buildroot}%{_bindir}/%{name} ; \
fi;

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%doc NEWS
%doc TODO
%{_bindir}/%{name}
%{_sbindir}/%{name}
%{_datadir}/applications/fedora-net-%{name}.desktop
%{_datadir}/pixmaps/*.png
%dir %{_datadir}/pixmaps/%{name}
%{_datadir}/pixmaps/%{name}/%{name}.png
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}

%changelog
* Tue Aug 5 2008 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.0-0.4
- Made autoconf and automake buildrequires conditional and remove
  %%GNUconfigure from the .spec
- Added aclocal and automake to %%prep stage in the .spec, because of outdated files inside
  the upstream tarball
- replaced another 'bare' make statement with %%{__make} in the %%install
  stage in the .spec

* Sat Aug 2 2008 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.0-0.3
- Added autoconf and automake to BuidRequires

* Sat Aug 2 2008 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.0-0.2
- Modified spec as per bugzilla review request #457212

* Fri Jun 6 2008 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.0-0.1
- Initial packaging

* Tue Feb 19 2008 Magnus-swe <magnus-swe at telia.com>
- Changed name to GAdmin-Squid.
- Switched to GPL version 3.

* Mon Jun 25 2007 Magnus-swe <magnus-swe at telia.com>
- Initial release


--- NEW FILE import.log ---
gadmin-squid-0_1_0-0_4_fc9:HEAD:gadmin-squid-0.1.0-0.4.fc9.src.rpm:1218246940


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gadmin-squid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Aug 2008 16:13:55 -0000	1.1
+++ .cvsignore	9 Aug 2008 01:56:24 -0000	1.2
@@ -0,0 +1 @@
+gadmin-squid-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gadmin-squid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Aug 2008 16:13:55 -0000	1.1
+++ sources	9 Aug 2008 01:56:24 -0000	1.2
@@ -0,0 +1 @@
+cdb23e367fc0d2f18c3717aabdc9ef21  gadmin-squid-0.1.0.tar.gz


