client/rhel/rhn-client-tools/rhn-client-tools.spec | 6
java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java | 76 ++++++++++
2 files changed, 82 insertions(+)
New commits:
commit 8be368ab7177faeeb67ab289db17d91cdf0096fe
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu May 13 11:25:35 2010 -0400
adding ContentSource DTO object for repo listtags
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
new file mode 100644
index 0000000..0afdfa2
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2009--2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.dto;
+
+import java.util.Date;
+
+
+/**
+ * ContentSourceDto
+ * @version $Rev$
+ */
+public class ContentSourceDto extends BaseDto {
+
+ private Long id;
+ private String label;
+ private Date lastSynced;
+
+ /**
+ *
+ * @return laste date repo was synced
+ */
+ public Date getLastSynced() {
+ return lastSynced;
+ }
+
+ /**
+ *
+ * @param lastSyncedIn date to set of last sync
+ */
+ public void setLastSynced(Date lastSyncedIn) {
+ this.lastSynced = lastSyncedIn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * @param idIn The id to set.
+ */
+ public void setId(Long idIn) {
+ this.id = idIn;
+ }
+
+ /**
+ * @return the label
+ */
+ public String getLabel() {
+ return label;
+ }
+
+
+ /**
+ * @param labelIn The label to set.
+ */
+ public void setLabel(String labelIn) {
+ this.label = labelIn;
+ }
+
+
+}
commit a158891e06cc91f45d87ff084af21c9c741e6e9a
Merge: 6907bfc... 31eb96a...
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu May 13 05:41:24 2010 -0400
Merge branch 'master' into repo
commit 31eb96a2f9cfa4413b161057f4aa3164fc7dd997
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 13 10:19:55 2010 +0200
591798 - Completly remove hal code from rhn-client-tools for F-13 and RHEL-6
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 274bbef..ab33c89 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -99,6 +99,12 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
+%else
+rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
+%endif
+
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn
rhn_register.desktop
%if 0%{?suse_version}
%suse_update_desktop_file rhn_register System